From f7e471a8b44b7e43f6b75e457d4ee778c96b4209 Mon Sep 17 00:00:00 2001
From: mxzhao <mengxuan.zhao@eglobalmark.com>
Date: Fri, 16 Nov 2018 15:13:54 +0100
Subject: [PATCH] SOL003 VNF LCM add response body schema

---
 .../CancelOperationTask.robot                 |  38 +-
 .../ChangeExternalVNFConnectivityTask.robot   |  16 +-
 .../ChangeVNFFlavourTask.robot                |  23 +-
 .../FailOperationTask.robot                   |  36 +-
 .../HealVNFTask.robot                         |  24 +-
 .../IndividualSubscription.robot              |  11 +-
 .../IndividualVNFInstance.robot               |  37 +-
 .../IndividualVnfLcmOperationOccurence.robot  |  13 +-
 .../InstantiateVNFTask.robot                  |  15 +-
 .../OperateVNFTask.robot                      |  23 +-
 .../RetryOperationTask.robot                  |  38 +-
 .../RollbackOperationTask.robot               |  38 +-
 .../ScaleVNFTask.robot                        |  33 +-
 .../ScaleVNFToLevelTask.robot                 |  21 +-
 .../Subscriptions.robot                       |  38 +-
 .../TerminateVNFTask.robot                    |  22 +-
 .../VNFInstances.robot                        |  94 +-
 .../VnfLcmOperationOccurences.robot           |  35 +-
 .../jsons/createVnfRequest.json               |   5 +
 .../jsons/lccnSubscriptionRequest.json        |  10 +
 .../schemas/problemDetails.schema.json        |  34 +
 .../schemas/subscriptions.schema.json         | 183 ++++
 .../schemas/vnfInstance.schema.json           | 985 ++++++++++++++++++
 .../schemas/vnfLcmOpOcc.schema.json           | 632 +++++++++++
 24 files changed, 2193 insertions(+), 211 deletions(-)
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json
 create mode 100644 SOL003/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json

diff --git a/SOL003/VNFLifecycleManagement-API_egm/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API_egm/CancelOperationTask.robot
index e439b1d9..b65802ad 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/CancelOperationTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This task resource represents the "Cancel operation" operation. The client can use this resource to cancel an ongoing VNF lifecycle operation.
 Suite setup    Check resource existance
 
@@ -14,14 +16,11 @@ Post Cancel operation task
     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}
-    Output    response
     Log    Validate Status code
     Integer    response status    202
-
-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
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 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
@@ -34,9 +33,12 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     Log    Final Fail an operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Post Fail operation task Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -50,8 +52,11 @@ Post Fail operation task Conflict (parallel LCM operation)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
 
 Post Fail operation task Not Found
@@ -67,15 +72,17 @@ Post Fail operation task Not Found
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 GET Fail operation task - Method not implemented
     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/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Fail operation task - Method not implemented
@@ -83,7 +90,6 @@ PUT Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Fail operation task - Method not implemented
@@ -91,7 +97,6 @@ PATCH Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Fail operation task - Method not implemented
@@ -99,7 +104,6 @@ DELETE Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
@@ -117,4 +121,10 @@ Launch another error handling action
 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?
\ No newline at end of file
+    # 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
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
index 9114703b..4a7b62a2 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ChangeExternalVNFConnectivityTask.robot
@@ -2,7 +2,9 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
-Library     OperatingSystem
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Change external VNF connectivity
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Change external VNF connectivity Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -31,8 +36,11 @@ Change external VNF connectivity Conflict (parallel LCM operation)
     ${body}=    Get File    json/changeExtVnfConnectivityRequest .json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
        
     
@@ -41,7 +49,6 @@ GET Change external VNF connectivity - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Change external VNF connectivity - Method not implemented
@@ -49,7 +56,6 @@ PUT Change external VNF connectivity - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Change external VNF connectivity - Method not implemented
@@ -57,7 +63,6 @@ PATCH Change external VNF connectivity - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Change external VNF connectivity - Method not implemented
@@ -65,7 +70,6 @@ DELETE Change external VNF connectivity - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_ext_conn    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
index 6738d165..facfd14c 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ChangeVNFFlavourTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library     OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Change deployment flavour of a vnfInstance
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
@@ -31,9 +36,12 @@ Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/changeVnfFlavourRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Change deployment flavour of a vnfInstance Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -50,8 +58,11 @@ Change deployment flavour of a vnfInstance Conflict (parallel LCM operation)
     ${body}=    Get File    json/changeVnfFlavourRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
     
 Change deployment flavour of a vnfInstance Not Found
@@ -69,6 +80,10 @@ Change deployment flavour of a vnfInstance Not Found
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body}
     Integer    response status    404
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
    
     
 GET Change deployment flavour VNFInstance - Method not implemented
@@ -76,7 +91,6 @@ GET Change deployment flavour VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Change deployment flavour VNFInstance - Method not implemented
@@ -84,7 +98,6 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Change deployment flavour VNFInstance - Method not implemented
@@ -92,7 +105,6 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Change deployment flavour VNFInstance - Method not implemented
@@ -100,7 +112,6 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/change_flavour    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API_egm/FailOperationTask.robot
index a6b20932..ec1783a3 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/FailOperationTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This task resource represents the "Fail operation" operation. 
 ...    The client can use this resource to mark a VNF lifecycle management operation occurrence as "finally failed", 
 ...    i.e. change the state of the related VNF LCM operation occurrence resource to "FAILED", if it is not assumed that a subsequent retry or rollback will succeed. 
@@ -19,11 +21,9 @@ Post Fail operation task
     Output    response
     Log    Validate Status code
     Integer    response status    202
-
-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
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 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
@@ -36,9 +36,12 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     Log    Final Fail an operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Post Fail operation task Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -52,8 +55,11 @@ Post Fail operation task Conflict (parallel LCM operation)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
 
 Post Fail operation task Not Found
@@ -69,15 +75,17 @@ Post Fail operation task Not Found
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/fail
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 GET Fail operation task - Method not implemented
     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/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Fail operation task - Method not implemented
@@ -85,7 +93,6 @@ PUT Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Fail operation task - Method not implemented
@@ -93,7 +100,6 @@ PATCH Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Fail operation task - Method not implemented
@@ -101,7 +107,6 @@ DELETE Fail operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/fail    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
@@ -119,4 +124,9 @@ Launch another error handling action
 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?
\ No newline at end of file
+    # 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
diff --git a/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
index 7ae0a75f..e96a4b92 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/HealVNFTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library     OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Heal a vnfInstance
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Heal a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
@@ -31,9 +36,12 @@ Heal a vnfInstance Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/healVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Heal a vnfInstance Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -50,8 +58,11 @@ Heal a vnfInstance Conflict (parallel LCM operation)
     ${body}=    Get File    json/healVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
     
 Heal a vnfInstance Not Found
@@ -69,14 +80,16 @@ Heal a vnfInstance Not Found
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    ${body}
     Integer    response status    404
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
    
-    
 GET Heal VNFInstance - Method not implemented
     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    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Heal VNFInstance - Method not implemented
@@ -84,7 +97,6 @@ PUT Heal VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Heal VNFInstance - Method not implemented
@@ -92,7 +104,6 @@ PATCH Heal VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Heal VNFInstance - Method not implemented
@@ -100,7 +111,6 @@ DELETE Heal VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/heal    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API_egm/IndividualSubscription.robot
index 94a774c3..b9df3ddb 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/IndividualSubscription.robot
@@ -2,6 +2,8 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT}    
 ...    spec=SOL003-VNFLifecycleManagement-API.yaml
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This resource represents an individual subscription. The client can use this resource to read and to terminate a
 ...    subscription to notifications related to VNF lifecycle management
 Suite setup    Check resource existance
@@ -14,7 +16,6 @@ Post Individual Subscription - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 Get Information about an individual subscription
@@ -23,8 +24,11 @@ Get Information about an individual subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
     Log    Validate Status code
-    Output    response
     Integer    response status    200
+     ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    subscriptions.schema.json    ${json}
+    Log    Validation OK
 
 PUT an individual subscription - Method not implemented
     log    Trying to perform a PUT. This method should not be implemented
@@ -33,7 +37,6 @@ PUT an individual subscription - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH an individual subscription - Method not implemented
@@ -43,7 +46,6 @@ PATCH an individual subscription - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE an individual subscription
@@ -52,7 +54,6 @@ DELETE an individual subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    
     Log    Validate Status code
-    Output    response
     Integer    response status    204
 
 *** Key words ***   
diff --git a/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
index ca8f3c03..8794e398 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/IndividualVNFInstance.robot
@@ -4,6 +4,9 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT}    
 ...    spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    OperatingSystem
+Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This resource represents an individual VNF instance. The client can use this resource to modify and delete the 
 ...    underlying VNF instance, and to read information about the VNF instance.
 Suite setup    Check resource existance
@@ -20,7 +23,6 @@ Post Individual VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 Get Information about an individual VNF Instance
@@ -30,9 +32,14 @@ Get Information about an individual VNF Instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
     Log    Validate Status code
-    Output    response
     ${Etag}=    Output    response headers Etag
     Integer    response status    200
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    vnfInstance.schema.json    ${json}
+    Log    Validation OK
     
 PUT Individual VNFInstance - Method not implemented 
     log    Trying to perform a PUT. This method should not be implemented
@@ -41,8 +48,6 @@ PUT Individual VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
     Log    Validate Status code
-    Output    response
-    ${Etag_modified}=    Output    response headers Etag
     Integer    response status    405
 
 PATCH Individual VNFInstance
@@ -57,14 +62,18 @@ PATCH Individual VNFInstance
     ${body}=    Get File    json/patchBodyRequest.json
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}
     Log    Validate Status code
-    Output    response
+    ${Etag_modified}=    Output    response headers Etag
     Integer    response status    202
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 PATCH Individual VNFInstance Precondition failed
     [Documentation]    Precondition Failed
     ...    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. 
     ...    The response body should contain a ProblemDetails structure, in which the “detail” attribute should convey more information about the error.
+    Depends On Test    PATCH Individual VNFInstance    # If the previous test scceeded, it means that Etag has been modified
     log    Trying to modify an individual VNF instance Precondition failed
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
@@ -73,8 +82,11 @@ PATCH Individual VNFInstance Precondition failed
     ${body}=    Get File    json/patchBodyRequest.json
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    412
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 PATCH Individual VNFInstance Conflict
     # TODO: Need to set the pre-condition of the test
@@ -89,19 +101,21 @@ PATCH Individual VNFInstance Conflict
     ${body}=    Get File    json/patchBodyRequest.json
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
 
-
 DELETE Individual VNFInstance
     [Documentation]    Delete VNF Identifier This method deletes an individual VNF instance resource.
     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}
     Log    Validate Status code
-    Output    response
     Integer    response status    204
+    Log    Validation OK
 
 DELETE Individual VNFInstance Conflict
     # TODO: Need to set the pre-condition of the test. The VnfInstance shall in INSTANTIATED state
@@ -114,8 +128,11 @@ DELETE Individual VNFInstance Conflict
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     
 *** Key words ***   
 
diff --git a/SOL003/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot
index f23ea4de..61d77065 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/IndividualVnfLcmOperationOccurence.robot
@@ -2,6 +2,8 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT}    
 ...    spec=SOL003-VNFLifecycleManagement-API.yaml
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This resource represents a VNF lifecycle management operation occurrence. The client can use this resource to read
 ...    status information about an individual VNF lifecycle management operation occurrence. Further, the client can use task
 ...    resources which are children of this resource to request cancellation of an operation in progress, and to request the
@@ -15,7 +17,6 @@ Post Individual VNF LCM OP occurences - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 Get stauts information about multiple VNF instances  
@@ -27,9 +28,14 @@ Get stauts information about multiple VNF instances
     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}
-    Output    response
     Log    Validate Status code
     Integer    response status    200
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    vnfLcmOpOcc.schema.json    ${json}
+    Log    Validation OK
 
 PUT stauts information about multiple VNF instances - Method not implemented 
     log    Trying to perform a PUT. This method should not be implemented
@@ -37,7 +43,6 @@ PUT stauts information about multiple VNF instances - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH stauts information about multiple VNF instances - Method not implemented 
@@ -46,7 +51,6 @@ PATCH stauts information about multiple VNF instances - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE stauts information about multiple VNF instances - Method not implemented 
@@ -55,5 +59,4 @@ DELETE stauts information about multiple VNF instances - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}
     Log    Validate Status code
-    Output    response
     Integer    response status    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
index 2b26a0b6..a86c177c 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/InstantiateVNFTask.robot
@@ -4,6 +4,8 @@ Library    REST    http://${VNFM_HOST}:${VNFM_PORT}
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    DependencyLibrary
 Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 
@@ -16,9 +18,11 @@ Instantiate a vnfInstance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/instantiateVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}
-    Output    response
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Instantiate a vnfInstance Conflict
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
@@ -33,16 +37,18 @@ Instantiate a vnfInstance Conflict
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/instantiateVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     
 GET Instantiate VNFInstance - Method not implemented
     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    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Instantiate VNFInstance - Method not implemented
@@ -50,7 +56,6 @@ PUT Instantiate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Instantiate VNFInstance - Method not implemented
@@ -58,7 +63,6 @@ PATCH Instantiate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Instantiate VNFInstance - Method not implemented
@@ -66,7 +70,6 @@ DELETE Instantiate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/instantiate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
index b4255b8f..140314fd 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/OperateVNFTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library     OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Operate a vnfInstance
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Operate a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
@@ -31,9 +36,12 @@ Operate a vnfInstance Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/operateVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Operate a vnfInstance Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -50,8 +58,11 @@ Operate a vnfInstance Conflict (parallel LCM operation)
     ${body}=    Get File    json/operateVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
     
 Operate a vnfInstance Not Found
@@ -69,14 +80,16 @@ Operate a vnfInstance Not Found
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    ${body}
     Integer    response status    404
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
    
-    
 GET Operate VNFInstance - Method not implemented
     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    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Operate VNFInstance - Method not implemented
@@ -92,7 +105,6 @@ PATCH Operate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Operate VNFInstance - Method not implemented
@@ -100,7 +112,6 @@ DELETE Operate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/operate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API_egm/RetryOperationTask.robot
index 5e0073e6..dd46f71e 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/RetryOperationTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This task resource represents the "Retry operation" operation. The client can use this resource to initiate retrying a VNF lifecycle operation.
 Suite setup    Check resource existance
 
@@ -10,18 +12,16 @@ Suite setup    Check resource existance
 Post Retry operation task  
     [Documentation]    The POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure,
     ...     i.e. the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    Depends on test    Check resource FAILED_TEMP
     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
-    Output    response
     Log    Validate Status code
     Integer    response status    202
-
-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
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 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
@@ -37,9 +37,14 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Post Retry operation task Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
+    Depends on test    Check resource FAILED_TEMP
     [Documentation]    Conflict
     ...    The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, 
@@ -50,8 +55,11 @@ Post Retry operation task Conflict (parallel LCM operation)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
 
 Post Retry operation task Not Found
@@ -67,15 +75,17 @@ Post Retry operation task Not Found
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/retry
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 GET Retry operation task - Method not implemented
     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/${vnfInstanceId}/retry    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Retry operation task - Method not implemented
@@ -83,7 +93,6 @@ PUT Retry operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/retry    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Retry operation task - Method not implemented
@@ -91,7 +100,6 @@ PATCH Retry operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/retry    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Retry operation task - Method not implemented
@@ -99,7 +107,6 @@ DELETE Retry operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/retry    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
@@ -117,4 +124,9 @@ Launch another error handling action
 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?
\ No newline at end of file
+    # 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
diff --git a/SOL003/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot
index 3ef91cf8..227a6db4 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/RollbackOperationTask.robot
@@ -3,6 +3,8 @@ Resource    variables.txt
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
 Library    DependencyLibrary
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This task resource represents the "Rollback operation" operation. The client can use this resource to initiate rolling back a VNF lifecycle operation
 Suite setup    Check resource existance
 
@@ -10,18 +12,16 @@ Suite setup    Check resource existance
 Post Rollback operation task  
     [Documentation]    The POST method initiates rolling back a VNF lifecycle operation if that operation has experienced a temporary failure, 
     ...    i.e. the related “VNF LCM operation occurrence” resource is in “FAILED_TEMP” state.
+    Depends on test    Check resource FAILED_TEMP
     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
-    Output    response
     Log    Validate Status code
     Integer    response status    202
-
-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
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 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
@@ -34,12 +34,16 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     Log    Rollback an operation
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Post Rollback operation task Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
+    Depends on test    Check resource FAILED_TEMP
     [Documentation]    Conflict
     ...    The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Typically, this is due to the fact that the VNF instance resource is not in FAILED_TEMP state, 
@@ -50,8 +54,11 @@ Post Rollback operation task Conflict (parallel LCM operation)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfLcmOpOccId}/rollback
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
 
 Post Rollback operation task Not Found
@@ -69,13 +76,16 @@ Post Rollback operation task Not Found
     Log    Validate Status code
     Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 GET Rollback operation task - Method not implemented
     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/${vnfInstanceId}/rollback    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Rollback operation task - Method not implemented
@@ -83,7 +93,6 @@ PUT Rollback operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/rollback    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Rollback operation task - Method not implemented
@@ -91,7 +100,6 @@ PATCH Rollback operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/rollback    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Rollback operation task - Method not implemented
@@ -99,7 +107,6 @@ DELETE Rollback operation task - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs/${vnfInstanceId}/rollback    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
@@ -117,4 +124,9 @@ Launch another error handling action
 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?
\ No newline at end of file
+    # 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
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
index 84baee7a..08a33faf 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFTask.robot
@@ -2,14 +2,15 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
-Library    DependencyLibrary
 Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
 Scale a vnfInstance
-    [Documentation]    Scale VNF The POST method scales a VNF instance.
-    Log    Trying to scale a vnf Instance
+    [Documentation]    Instantiate VNF The POST method instantiates a VNF instance.
+    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}"}
@@ -17,9 +18,12 @@ Scale a vnfInstance
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Scale a vnfInstance Conflict (Not-Instantiated)
-    # TODO: Need to set the pre-condition of the test. VNF instance shall be in NOT-INSTANTIATED state
+    # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Conflict. 
     ...    The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. 
@@ -31,9 +35,12 @@ Scale a vnfInstance Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Scale a vnfInstance Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -48,9 +55,12 @@ Scale a vnfInstance Conflict (parallel LCM operation)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/scaleVnfRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    Log    Validate Status code
-    Output    response
     Integer    response status    409
+    Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
     
 Scale a vnfInstance Not Found
@@ -68,14 +78,16 @@ Scale a vnfInstance Not Found
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
     Integer    response status    404
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
    
-    
 GET Scale VNFInstance - Method not implemented
     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    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Scale VNFInstance - Method not implemented
@@ -83,7 +95,6 @@ PUT Scale VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Scale VNFInstance - Method not implemented
@@ -91,7 +102,6 @@ PATCH Scale VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Scale VNFInstance - Method not implemented
@@ -99,7 +109,6 @@ DELETE Scale VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
index 59cd8657..4238ea13 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/ScaleVNFToLevelTask.robot
@@ -2,7 +2,9 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
-Library     OperatingSystem
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Scale a vnfInstance to level
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 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
@@ -30,9 +35,12 @@ Scale a vnfInstance to level Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/scaleVnfToLevelRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Scale a vnfInstance to level Conflict (parallel LCM operation)
     [Documentation]    Conflict
@@ -47,8 +55,11 @@ Scale a vnfInstance to level Conflict (parallel LCM operation)
     ${body}=    Get File    json/scaleVnfToLevelRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
     
 Scale a vnfInstance Not Found
@@ -66,6 +77,10 @@ Scale a vnfInstance Not Found
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
     Integer    response status    404
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
    
     
 GET Scale to level VNFInstance - Method not implemented
diff --git a/SOL003/VNFLifecycleManagement-API_egm/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API_egm/Subscriptions.robot
index 33e0b97e..b1b58e16 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/Subscriptions.robot
@@ -2,7 +2,9 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
-Library     OperatingSystem
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 
 *** Test Cases ***
 Create a new subscription
@@ -12,9 +14,16 @@ Create a new subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/lccbSubscriptionRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Output    response
     Integer    response status    201
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    subscriptions.schema.json    ${json}
+    Log    Validation OK
 
 Create a new Subscription - DUPLICATION
     Log    Trying to create a subscription with an already created content
@@ -24,9 +33,14 @@ Create a new Subscription - DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    json/lccbSubscriptionRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Output    response
     Integer    response status    201
     Log    Status code validated
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    subscriptions.schema.json    ${json}
+    Log    Validation OK
 
 Create a new Subscription - NO-DUPLICATION
     Log    Trying to create a subscription with an already created content
@@ -36,9 +50,11 @@ Create a new Subscription - NO-DUPLICATION
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    json/lccbSubscriptionRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}
-    Output    response
     Integer    response status    303
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 GET Subscriptions
     Log    Get the list of active subscriptions
@@ -47,9 +63,12 @@ GET Subscriptions
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    Output    response
     Log    Validate Status code
     Integer    response status    200
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    subscriptions.schema.json    ${json}
+    Log    Validation OK
 
 GET Subscription - Filter
     Log    Get the list of active subscriptions using a filter
@@ -58,6 +77,10 @@ GET Subscription - Filter
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}
     Integer    response status    200
     Log    Received a 200 OK as expected
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    subscriptions.schema.json    ${json}
+    Log    Validation OK
     
 GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Log    Get the list of active subscriptions using an invalid filter
@@ -66,6 +89,8 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}
     Integer    response status    400
     Log    Received a 400 Bad Request as expected
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
     
 PUT subscriptions - Method not implemented
     log    Trying to perform a PUT. This method should not be implemented
@@ -74,7 +99,6 @@ PUT subscriptions - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH subscriptions - Method not implemented
@@ -84,7 +108,6 @@ PATCH subscriptions - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 DELETE subscriptions - Method not implemented
@@ -94,6 +117,5 @@ DELETE subscriptions - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
index bba27460..f7cedf46 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/TerminateVNFTask.robot
@@ -2,7 +2,9 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
-Library     OperatingSystem
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Suite setup    Check resource existance
 
 *** Test Cases ***
@@ -16,6 +18,9 @@ Terminate a vnfInstance
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
     Integer    response status    202
     Log    Status code validated
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    Log    Validation OK
 
 Terminate a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
@@ -31,9 +36,12 @@ Terminate a vnfInstance Conflict (Not-Instantiated)
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    json/terminateVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
-    Output    response
     Integer    response status    409
     Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Terminate a vnfInstance Conflict (parallel LCM operation)
     # TODO: Need to set the pre-condition of the test
@@ -50,17 +58,18 @@ Terminate a vnfInstance Conflict (parallel LCM operation)
     ${body}=    Get File    json/terminateVnFRequest.json
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
     Log    Validate Status code
-    Output    response
     Integer    response status    409
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     [Teardown]    #We cannot know if the "scale" operation is finished easily because the 202 indicates only whether the operation has been accepted, not whether the operation has been finished
        
-    
 GET Terminate VNFInstance - Method not implemented
     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    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PUT Terminate VNFInstance - Method not implemented
@@ -68,7 +77,6 @@ PUT Terminate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH Terminate VNFInstance - Method not implemented
@@ -76,7 +84,6 @@ PATCH Terminate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
     
 DELETE Terminate VNFInstance - Method not implemented
@@ -84,7 +91,6 @@ DELETE Terminate VNFInstance - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 *** Key words ***
diff --git a/SOL003/VNFLifecycleManagement-API_egm/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API_egm/VNFInstances.robot
index 391f4e9c..4ce1ed86 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/VNFInstances.robot
@@ -3,6 +3,9 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT} 
 ...        spec=SOL003-VNFLifecycleManagement-API.yaml
+Library    OperatingSystem
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 
 *** Test cases ***
 
@@ -12,40 +15,18 @@ Create a new 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    {"vnfdId": "${vnfInstanceId}","vnfInstanceName": "${vnfInstanceName}", "vnfInstanceDescription": "${vnfInstanceDescription}"}
-    Output    response
+    ${body}=    Get File    json/createVnfRequest.json
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    ${body}
     Integer    response status    201
-    Log    Status code validated    
-
-# Create a new vnfInstance Bad Request
-    # Log    Create VNF instance by POST to /vnflcm/v1/vnf_instances
-    # Set Headers  {"Accept":"${ACCEPT}"}  
-    # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    # Post    /vnflcm/v1/vnf_instances    {"bad_request": "bad_example"}
-    # Output    response
-    # Integer    response status    400
-    # Log    Status code validated
-
-# Create a new vnfInstance Unauthorized
-    # Log    Create VNF instance by POST to /vnflcm/v1/vnf_instances
-    # Set Headers  {"Accept":"${ACCEPT}"}  
-    # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    # #Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${WRONG_AUTHORIZATION}"}
-    # Post    /vnflcm/v1/vnf_instances    {"vnfdId": "12345","vnfInstanceName": "Test-VnfInstance", "vnfInstanceDescription": "bla"}
-    # Output    response
-    # Integer    response status    401
-    # Log    Status code validated
-    
-# Create a new vnfInstance Forbidden
-    # Log    Create VNF instance by POST to /vnflcm/v1/vnf_instances
-    # Set Headers  {"Accept":"${ACCEPT}"}  
-    # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
-    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${WRONG_AUTHORIZATION}"}
-    # Post    /vnflcm/v1/vnf_instances    {"vnfdId": "12345","vnfInstanceName": "Test-VnfInstance", "vnfInstanceDescription": "bla"}
-    # Output    response
-    # Integer    response status    403
-    # Log    Status code validated
+    Log    Status code validated 
+    ${headers}=    Output    response headers
+    Should Contain    ${headers}    Location
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    vnfInstance.schema.json    ${json}
+    Log    Validation OK
 
 Get information about multiple VNF instances  
     Log    Query VNF The GET method queries information about multiple VNF instances.
@@ -54,9 +35,14 @@ Get information about multiple VNF instances
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances
-    Output    response
     Log    Validate Status code
     Integer    response status    200
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    vnfInstance.schema.json    ${json}
+    Log    Validation OK
 
 Get information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
     Log    Query VNF The GET method queries information about multiple VNF instances.
@@ -65,8 +51,11 @@ Get information about multiple VNF instances Bad Request Invalid attribute-based
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?attribute_not_exist=some_value
     Log    Validate Status code
-    Output    response
     Integer    response status    400
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
 Get information about multiple VNF instances Bad Request Invalid attribute selector
     Log    Query VNF The GET method queries information about multiple VNF instances.
@@ -75,37 +64,19 @@ Get information about multiple VNF instances Bad Request Invalid attribute selec
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances?fields=wrong_field
     Log    Validate Status code
-    Output    response
     Integer    response status    400
-
-# Get information about multiple VNF instances Unauthorized
-    # 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":"${WRONG_AUTHORIZATION}"}
-    # Get    /vnflcm/v1/vnf_instances
-    # Output    response
-    # Integer    response status    401
-    # Log    Status code validated
-
-# Get information about multiple VNF instances Forbidden
-    # 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":"${WRONG_AUTHORIZATION}"}
-    # Get    /vnflcm/v1/vnf_instances
-    # Output    response
-    # Integer    response status    403
-    # Log    Status code validated
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     
 PUT VNFInstances - Method not implemented
     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    {"vnfInstanceDescription": "${vnfInstanceDescription_Update}"}
+    Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances   
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 PATCH VNFInstances - Method not implemented
@@ -113,9 +84,8 @@ PATCH VNFInstances - Method not implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    {"vnfInstanceDescription": "${vnfInstanceDescription_Update}"}
+    Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances    
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
 DELETE VNFInstances - Method not implemented
@@ -125,6 +95,4 @@ DELETE VNFInstances - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances
     Log    Validate Status code
-    Output    response
-    Integer    response status    405
-
+    Integer    response status    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot
index 2a0985fd..f09b1d40 100644
--- a/SOL003/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API_egm/VnfLcmOperationOccurences.robot
@@ -2,6 +2,8 @@
 Resource    variables.txt 
 Library    REST    http://${VNFM_HOST}:${VNFM_PORT}    
 ...    spec=SOL003-VNFLifecycleManagement-API.yaml
+Library    JSONLibrary
+Library    JSONSchemaLibrary    schemas/
 Documentation    This resource represents VNF lifecycle management operation occurrences. The client can use this resource to query
 ...    status information about multiple VNF lifecycle management operation occurrences.
 
@@ -12,60 +14,67 @@ Post VNF LCM OP occurences - Method not implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs 
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
-Get stauts information about multiple VNF instances  
+Get stauts information about multiple VNF LCM OP OCC   
     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
-    Output    response
     Log    Validate Status code
     Integer    response status    200
+    ${contentType}=    Output    response headers Content-Type
+    Should Contain    ${contentType}    ${CONTENT_TYPE}
+    ${result}=    Output    response body
+    ${json}=    evaluate    json.loads('''${result}''')    json
+    Validate Json    vnfLcmOpOcc.schema.json    ${json}
+    Log    Validation OK
 
-Get stauts information about multiple VNF instances Bad Request Invalid attribute-based filtering parameters
+Get stauts information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters
     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
     Log    Validate Status code
-    Output    response
     Integer    response status    400
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
 
-Get stauts information about multiple VNF instances Bad Request Invalid attribute selector
+Get stauts information about multiple VNF LCM OP OCC Bad Request Invalid attribute selector
     Log    Query VNF The GET method queries information about multiple VNF instances.
     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
     Log    Validate Status code
-    Output    response
     Integer    response status    400
+    ${problemDetails}=    Output    response body
+    ${json}=    evaluate    json.loads('''${problemDetails}''')    json
+    Validate Json    ProblemDetails.schema.json    ${json}
+    Log    Validation OK
     
-PUT stauts information about multiple VNF instances - Method not implemented
+PUT stauts information about multiple VNF LCM OP OCC - Method not implemented
     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
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
-PATCH stauts information about multiple VNF instances - Method not implemented
+PATCH stauts information about multiple VNF LCM OP OCC - Method not implemented
     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
     Log    Validate Status code
-    Output    response
     Integer    response status    405
 
-DELETE stauts information about multiple VNF instances - Method not implemented
+DELETE stauts information about multiple VNF LCM OP OCC - Method not implemented
     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
     Log    Validate Status code
-    Output    response
     Integer    response status    405
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json b/SOL003/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json
new file mode 100644
index 00000000..8a1fda3b
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/jsons/createVnfRequest.json
@@ -0,0 +1,5 @@
+{
+  "vnfdId": "6fc3539c-e602-4afa-8e13-962fb5a7d81f",
+  "vnfInstanceName": "string",
+  "vnfInstanceDescription": "string"
+}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json b/SOL003/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json
new file mode 100644
index 00000000..e44916f8
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/jsons/lccnSubscriptionRequest.json
@@ -0,0 +1,10 @@
+{
+  "filter": {
+    "vnfInstanceSubscriptionFilter": {
+      "vnfdIds": [
+        "6fc3539c-e602-4afa-8e13-962fb5a7d81f"
+      ]
+    }
+  },
+  "callbackUri": "http://127.0.0.1/subscribe"
+}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json b/SOL003/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json
new file mode 100644
index 00000000..62f17612
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/schemas/problemDetails.schema.json
@@ -0,0 +1,34 @@
+{
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
+  "properties": {
+    "type": {
+      "type": "string",
+      "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
+      "format": "URI"
+    },
+    "title": {
+      "type": "string",
+      "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
+    },
+    "status": {
+      "type": "integer",
+      "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
+    },
+    "detail": {
+      "type": "string",
+      "description": "A human-readable explanation specific to this occurrence of the problem.\n"
+    },
+    "instance": {
+      "type": "string",
+      "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
+      "format": "URI"
+    }
+  },
+  "required": [
+    "status",
+    "detail"
+  ]
+}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json b/SOL003/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json
new file mode 100644
index 00000000..d03a46e1
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/schemas/subscriptions.schema.json
@@ -0,0 +1,183 @@
+{
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n",
+  "required": [
+    "id",
+    "callbackUri",
+    "_links"
+  ],
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "filter": {
+      "type": "object",
+      "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",
+      "properties": {
+        "vnfInstanceSubscriptionFilter": {
+          "type": "object",
+          "description": "This type represents subscription filter criteria to match VNF instances.\n",
+          "properties": {
+            "vnfdIds": {
+              "type": "array",
+              "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",
+              "items": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              }
+            },
+            "vnfProductsFromProviders": {
+              "type": "array",
+              "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",
+              "items": {
+                "type": "object",
+                "required": [
+                  "vnfProvider"
+                ],
+                "properties": {
+                  "vnfProvider": {
+                    "type": "string",
+                    "description": "Name of the VNF provider to match.\n"
+                  },
+                  "vnfProducts": {
+                    "type": "array",
+                    "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
+                    "items": {
+                      "type": "object",
+                      "required": [
+                        "vnfProductName"
+                      ],
+                      "properties": {
+                        "vnfProductName": {
+                          "type": "string",
+                          "description": "Name of the VNF product to match.\n"
+                        },
+                        "versions": {
+                          "type": "array",
+                          "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
+                          "items": {
+                            "type": "object",
+                            "required": [
+                              "vnfSoftwareVersion"
+                            ],
+                            "properties": {
+                              "vnfSoftwareVersion": {
+                                "type": "string",
+                                "description": "A version.\n"
+                              },
+                              "vnfdVersions": {
+                                "type": "array",
+                                "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",
+                                "items": {
+                                  "type": "string",
+                                  "description": "A version.\n"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "vnfInstanceIds": {
+              "type": "array",
+              "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",
+              "items": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              }
+            },
+            "vnfInstanceNames": {
+              "type": "array",
+              "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",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "notificationTypes": {
+          "type": "array",
+          "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",
+          "items": {
+            "type": "string",
+            "enum": [
+              "VnfLcmOperationOccurrenceNotification",
+              "VnfIdentifierCreationNotification",
+              "VnfIdentifierDeletionNotification"
+            ]
+          }
+        },
+        "operationTypes": {
+          "type": "array",
+          "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",
+          "items": {
+            "type": "string",
+            "enum": [
+              "INSTANTIATE",
+              "SCALE",
+              "SCALE_TO_LEVEL",
+              "CHANGE_FLAVOUR",
+              "TERMINATE",
+              "HEAL",
+              "OPERATE",
+              "CHANGE_EXT_CONN",
+              "MODIFY_INFO"
+            ],
+            "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"
+          }
+        },
+        "operationStates": {
+          "type": "array",
+          "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",
+          "items": {
+            "type": "string",
+            "enum": [
+              "STARTING",
+              "PROCESSING",
+              "COMPLETED",
+              "FAILED_TEMP",
+              "FAILED",
+              "ROLLING_BACK",
+              "ROLLED_BACK"
+            ],
+            "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"
+          }
+        }
+      }
+    },
+    "callbackUri": {
+      "type": "string",
+      "description": "String formatted according to IETF RFC 3986.\n"
+    },
+    "_links": {
+      "type": "object",
+      "description": "Links to resources related to this resource.\n",
+      "required": [
+        "self"
+      ],
+      "properties": {
+        "self": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json b/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json
new file mode 100644
index 00000000..e0122312
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfInstance.schema.json
@@ -0,0 +1,985 @@
+{
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "This type represents a VNF instance.\n",
+  "required": [
+    "id",
+    "vnfdId",
+    "vnfProvider",
+    "vnfProductName",
+    "vnfSoftwareVersion",
+    "vnfdVersion",
+    "vnfPkgId",
+    "instantiationState"
+  ],
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "vnfInstanceName": {
+      "type": "string",
+      "description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n"
+    },
+    "vnfInstanceDescription": {
+      "type": "string",
+      "description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n"
+    },
+    "vnfdId": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "vnfProvider": {
+      "type": "string",
+      "description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n"
+    },
+    "vnfProductName": {
+      "type": "string",
+      "description": "Name to identify the VNF Product. The value is copied from the VNFD.\n"
+    },
+    "vnfSoftwareVersion": {
+      "type": "string",
+      "description": "A Version.\n"
+    },
+    "vnfdVersion": {
+      "type": "string",
+      "description": "A Version.\n"
+    },
+    "vnfPkgId": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "vnfConfigurableProperties": {
+      "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"
+    },
+    "vimConnectionInfo": {
+      "type": "array",
+      "description": "Information about VIM connections to be used for managing the resources for the VNF instance. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. This attribute can be modified with the PATCH method.\n",
+      "items": {
+        "type": "object",
+        "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
+        "required": [
+          "id",
+          "vimType"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "An identifier with the intention of being globally unique.\n"
+          },
+          "vimId": {
+            "type": "string",
+            "description": "An identifier with the intention of being globally unique.\n"
+          },
+          "vimType": {
+            "type": "string",
+            "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n"
+          },
+          "interfaceInfo": {
+            "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"
+          },
+          "accessInfo": {
+            "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"
+          },
+          "extra": {
+            "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"
+          }
+        }
+      }
+    },
+    "instantiationState": {
+      "type": "string",
+      "enum": [
+        "NOT_INSTANTIATED",
+        "INSTANTIATED"
+      ],
+      "description": "The instantiation state of the VNF.\n"
+    },
+    "instantiatedVnfInfo": {
+      "type": "object",
+      "description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
+      "required": [
+        "flavourId",
+        "vnfState"
+      ],
+      "properties": {
+        "flavourId": {
+          "type": "string",
+          "description": "An identifier that is unique within a VNF descriptor.\n"
+        },
+        "vnfState": {
+          "type": "string",
+          "enum": [
+            "STARTED",
+            "STOPPED"
+          ]
+        },
+        "scaleStatus": {
+          "type": "array",
+          "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
+          "items": {
+            "type": "object",
+            "required": [
+              "aspectId",
+              "scaleLevel"
+            ],
+            "properties": {
+              "aspectId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "scaleLevel": {
+                "type": "integer",
+                "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n"
+              }
+            }
+          }
+        },
+        "extCpInfo": {
+          "type": "array",
+          "description": "Information about the external CPs exposed by the VNF instance.\n",
+          "minItems": 1,
+          "items": {
+            "type": "object",
+            "required": [
+              "id",
+              "cpdId"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "cpdId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "cpProtocolInfo": {
+                "type": "array",
+                "description": "Network protocol information for this CP.\n",
+                "items": {
+                  "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. \n",
+                  "required": [
+                    "layerProtocol"
+                  ],
+                  "properties": {
+                    "layerProtocol": {
+                      "type": "string",
+                      "enum": [
+                        "IP_OVER_ETHERNET"
+                      ],
+                      "description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n"
+                    },
+                    "ipOverEthernet": {
+                      "type": "object",
+                      "description": "This type represents information about a network address that has been assigned. \n",
+                      "required": [
+                        "macAddress"
+                      ],
+                      "properties": {
+                        "macAddress": {
+                          "type": "string",
+                          "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                          "format": "MAC"
+                        },
+                        "ipAddresses": {
+                          "type": "array",
+                          "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
+                          "items": {
+                            "type": "object",
+                            "required": [
+                              "type"
+                            ],
+                            "properties": {
+                              "type": {
+                                "type": "string",
+                                "enum": [
+                                  "IPV4",
+                                  "IPV6"
+                                ],
+                                "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n"
+                              },
+                              "addresses": {
+                                "type": "array",
+                                "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
+                                "items": {
+                                  "type": "string",
+                                  "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                  "format": "IP"
+                                }
+                              },
+                              "isDynamic": {
+                                "type": "boolean",
+                                "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n"
+                              },
+                              "addressRange": {
+                                "type": "object",
+                                "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                "required": [
+                                  "minAddress",
+                                  "maxAddress"
+                                ],
+                                "properties": {
+                                  "minAddress": {
+                                    "type": "string",
+                                    "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                    "format": "IP"
+                                  },
+                                  "maxAddress": {
+                                    "type": "string",
+                                    "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                    "format": "IP"
+                                  }
+                                }
+                              },
+                              "subnetId": {
+                                "type": "string",
+                                "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                "format": "IP"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "extLinkPortId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              }
+            }
+          }
+        },
+        "extVirtualLinkInfo": {
+          "type": "array",
+          "description": "Information about the external VLs the VNF instance is connected to.\n",
+          "items": {
+            "type": "object",
+            "required": [
+              "id",
+              "resourceHandle"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "resourceHandle": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "extLinkPorts": {
+                "type": "array",
+                "description": "Link ports of this VL.\n",
+                "items": {
+                  "type": "object",
+                  "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL. \n",
+                  "required": [
+                    "id",
+                    "resourceHandle"
+                  ],
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "An identifier with the intention of being globally unique.\n"
+                    },
+                    "resourceHandle": {
+                      "type": "object",
+                      "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                      "required": [
+                        "vimConnectionId",
+                        "resourceId"
+                      ],
+                      "properties": {
+                        "vimConnectionId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceProviderId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceId": {
+                          "type": "string",
+                          "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                        },
+                        "vimLevelResourceType": {
+                          "type": "string",
+                          "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                        }
+                      }
+                    },
+                    "cpInstanceId": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "extManagedVirtualLinkInfo": {
+          "type": "array",
+          "description": "External virtual links the VNF instance is connected to.\n",
+          "items": {
+            "type": "object",
+            "required": [
+              "id",
+              "vnfVirtualLinkDescId"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "vnfVirtualLinkDescId": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "networkResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "vnfLinkPorts": {
+                "type": "array",
+                "description": "Link ports of this VL.\n",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "id",
+                    "resourceHandle"
+                  ],
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    },
+                    "resourceHandle": {
+                      "type": "object",
+                      "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                      "required": [
+                        "vimConnectionId",
+                        "resourceId"
+                      ],
+                      "properties": {
+                        "vimConnectionId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceProviderId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceId": {
+                          "type": "string",
+                          "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                        },
+                        "vimLevelResourceType": {
+                          "type": "string",
+                          "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                        }
+                      }
+                    },
+                    "cpInstanceId": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "monitoringParameters": {
+          "type": "array",
+          "description": "Active monitoring parameters.\n",
+          "items": {
+            "type": "object",
+            "required": [
+              "id",
+              "value",
+              "timeStamp"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "name": {
+                "type": "string",
+                "description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n"
+              },
+              "value": {
+                "type": "object",
+                "description": "Value of the monitoring parameter known to the VNFM (e.g. obtained for autoscaling purposes). The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures/Objects)) is assumed to be defined in an external measurement specification.\n"
+              },
+              "timeStamp": {
+                "type": "string",
+                "description": "Represents the point in time when the measurement has been performed, as known to the VNFM. Should be formatted according to ETF RFC 3339.\n"
+              }
+            }
+          }
+        },
+        "localizationLanguage": {
+          "type": "string",
+          "description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n"
+        },
+        "vnfcResourceInfo": {
+          "type": "array",
+          "description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
+          "items": {
+            "type": "object",
+            "description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
+            "required": [
+              "id",
+              "vduId",
+              "computeResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "vduId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "computeResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "storageResourceIds": {
+                "type": "array",
+                "description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
+                "items": {
+                  "type": "string",
+                  "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                }
+              },
+              "reservationId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "vnfcCpInfo": {
+                "type": "array",
+                "description": "CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is associated to an external CP of the VNF instance. May be present otherwise.\n",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "id",
+                    "cpdId"
+                  ],
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    },
+                    "cpdId": {
+                      "type": "string",
+                      "description": "An identifier that is unique within a VNF descriptor.\n"
+                    },
+                    "vnfExtCpId": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    },
+                    "cpProtocolInfo": {
+                      "type": "array",
+                      "description": "Network protocol information for this CP.\n",
+                      "items": {
+                        "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses. \n",
+                        "required": [
+                          "layerProtocol"
+                        ],
+                        "properties": {
+                          "layerProtocol": {
+                            "type": "string",
+                            "enum": [
+                              "IP_OVER_ETHERNET"
+                            ],
+                            "description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n"
+                          },
+                          "ipOverEthernet": {
+                            "type": "object",
+                            "description": "This type represents information about a network address that has been assigned. \n",
+                            "required": [
+                              "macAddress"
+                            ],
+                            "properties": {
+                              "macAddress": {
+                                "type": "string",
+                                "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                "format": "MAC"
+                              },
+                              "ipAddresses": {
+                                "type": "array",
+                                "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
+                                "items": {
+                                  "type": "object",
+                                  "required": [
+                                    "type"
+                                  ],
+                                  "properties": {
+                                    "type": {
+                                      "type": "string",
+                                      "enum": [
+                                        "IPV4",
+                                        "IPV6"
+                                      ],
+                                      "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n"
+                                    },
+                                    "addresses": {
+                                      "type": "array",
+                                      "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
+                                      "items": {
+                                        "type": "string",
+                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                        "format": "IP"
+                                      }
+                                    },
+                                    "isDynamic": {
+                                      "type": "boolean",
+                                      "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n"
+                                    },
+                                    "addressRange": {
+                                      "type": "object",
+                                      "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                      "required": [
+                                        "minAddress",
+                                        "maxAddress"
+                                      ],
+                                      "properties": {
+                                        "minAddress": {
+                                          "type": "string",
+                                          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                          "format": "IP"
+                                        },
+                                        "maxAddress": {
+                                          "type": "string",
+                                          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                          "format": "IP"
+                                        }
+                                      }
+                                    },
+                                    "subnetId": {
+                                      "type": "string",
+                                      "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                      "format": "IP"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "vnfLinkPortId": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    }
+                  }
+                }
+              },
+              "metadata": {
+                "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"
+              }
+            }
+          }
+        },
+        "virtualLinkResourceInfo": {
+          "type": "array",
+          "description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
+          "items": {
+            "type": "object",
+            "description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
+            "required": [
+              "id",
+              "vnfVirtualLinkDescId",
+              "networkResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "vnfVirtualLinkDescId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "networkResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "reservationId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "vnfLinkPorts": {
+                "type": "array",
+                "description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "id",
+                    "resourceHandle"
+                  ],
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    },
+                    "resourceHandle": {
+                      "type": "object",
+                      "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                      "required": [
+                        "vimConnectionId",
+                        "resourceId"
+                      ],
+                      "properties": {
+                        "vimConnectionId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceProviderId": {
+                          "type": "string",
+                          "description": "An identifier with the intention of being globally unique.\n"
+                        },
+                        "resourceId": {
+                          "type": "string",
+                          "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                        },
+                        "vimLevelResourceType": {
+                          "type": "string",
+                          "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                        }
+                      }
+                    },
+                    "cpInstanceId": {
+                      "type": "string",
+                      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                    }
+                  }
+                }
+              },
+              "metadata": {
+                "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"
+              }
+            }
+          }
+        },
+        "virtualStorageResourceInfo": {
+          "type": "array",
+          "description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
+          "items": {
+            "type": "object",
+            "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
+            "required": [
+              "id",
+              "virtualStorageDescId",
+              "storageResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "virtualStorageDescId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "storageResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "reservationId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "metadata": {
+                "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"
+              }
+            }
+          }
+        }
+      }
+    },
+    "metadata": {
+      "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"
+    },
+    "extensions": {
+      "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"
+    },
+    "_links": {
+      "type": "object",
+      "description": "Links to resources related to this resource.\n",
+      "required": [
+        "self"
+      ],
+      "properties": {
+        "self": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "indicators": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "instantiate": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "terminate": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "scale": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "scaleToLevel": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "changeFlavour": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "heal": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "operate": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "changeExtConn": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json b/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json
new file mode 100644
index 00000000..aa8d1dcb
--- /dev/null
+++ b/SOL003/VNFLifecycleManagement-API_egm/schemas/vnfLcmOpOcc.schema.json
@@ -0,0 +1,632 @@
+{
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "description": "This type represents a VNF lifecycle management operation occurrence.\n",
+  "required": [
+    "id",
+    "operationState",
+    "stateEnteredTime",
+    "startTime",
+    "vnfInstanceId",
+    "operation",
+    "isAutomaticInvocation",
+    "operationParams",
+    "isCancelPending"
+  ],
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "operationState": {
+      "type": "string",
+      "enum": [
+        "STARTING",
+        "PROCESSING",
+        "COMPLETED",
+        "FAILED_TEMP",
+        "FAILED",
+        "ROLLING_BACK",
+        "ROLLED_BACK"
+      ],
+      "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"
+    },
+    "stateEnteredTime": {
+      "type": "string",
+      "description": "Date-time when the current state was entered.\n",
+      "format": "date-time"
+    },
+    "startTime": {
+      "type": "string",
+      "description": "Date-time of the start of the operation.\n",
+      "format": "date-time"
+    },
+    "vnfInstanceId": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "grantId": {
+      "type": "string",
+      "description": "An identifier with the intention of being globally unique.\n"
+    },
+    "operation": {
+      "type": "string",
+      "enum": [
+        "INSTANTIATE",
+        "SCALE",
+        "SCALE_TO_LEVEL",
+        "CHANGE_FLAVOUR",
+        "TERMINATE",
+        "HEAL",
+        "OPERATE",
+        "CHANGE_EXT_CONN",
+        "MODIFY_INFO"
+      ],
+      "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"
+    },
+    "isAutomaticInvocation": {
+      "type": "boolean",
+      "description": "Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise.\n"
+    },
+    "operationParams": {
+      "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"
+    },
+    "isCancelPending": {
+      "type": "boolean",
+      "description": "If the VNF LCM operation occurrence is in \"STARTING\", \"PROCESSING\" or \"ROLLING_BACK\" state and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false.\n"
+    },
+    "cancelMode": {
+      "type": "string",
+      "enum": [
+        "GRACEFUL",
+        "FORCEFUL"
+      ],
+      "description": "Cancellation mode. GRACEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation and shall wait for the ongoing resource management operations in the underlying system, typically the VIM, to finish execution or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state. If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and shall wait for the granting request to finish execution or time out. After that, the VNFM shall put the operation occurrence into the ROLLED_BACK state.  FORCEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation, shall cancel the ongoing resource management operations in the underlying system, typically the VIM, and shall wait for the cancellation to finish or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state.  If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and put the operation occurrence into the ROLLED_BACK state.\n"
+    },
+    "error": {
+      "type": "object",
+      "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
+          "format": "URI"
+        },
+        "title": {
+          "type": "string",
+          "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
+        },
+        "status": {
+          "type": "integer",
+          "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
+        },
+        "detail": {
+          "type": "string",
+          "description": "A human-readable explanation specific to this occurrence of the problem.\n"
+        },
+        "instance": {
+          "type": "string",
+          "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
+          "format": "URI"
+        }
+      },
+      "required": [
+        "status",
+        "detail"
+      ]
+    },
+    "resourceChanges": {
+      "type": "object",
+      "description": "This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the LCM operation since its start, if applicable.\n",
+      "properties": {
+        "affectedVnfcs": {
+          "type": "array",
+          "description": "Information about VNFC instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
+          "items": {
+            "type": "object",
+            "description": "This type provides information about added, deleted, modified and temporary VNFCs.  \n",
+            "required": [
+              "id",
+              "vduId",
+              "changeType",
+              "computeResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "vduId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "changeType": {
+                "type": "string",
+                "enum": [
+                  "ADDED",
+                  "REMOVED",
+                  "MODIFIED",
+                  "TEMPORARY"
+                ],
+                "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVnfc structure exists as long as the temporary resource exists.\n"
+              },
+              "computeResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "metadata": {
+                "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"
+              },
+              "affectedVnfcCpIds": {
+                "type": "array",
+                "description": "Identifiers of CP(s) of the VNFC instance that were affected by the change.  Shall be present for those affected CPs of the VNFC instance that are associated to an external CP of the VNF instance. May be present for further affected CPs of the VNFC instance.\n",
+                "items": {
+                  "type": "string",
+                  "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                }
+              },
+              "addedStorageResourceIds": {
+                "type": "array",
+                "description": "References to VirtualStorage resources that have been added. Each value refers to a VirtualStorageResourceInfo item in the VnfInstance that was added to the VNFC. It shall be provided if at least one storage resource was added to the VNFC.\n",
+                "items": {
+                  "type": "string",
+                  "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                }
+              },
+              "removedStorageResourceIds": {
+                "type": "array",
+                "description": "References to VirtualStorage resources that have been removed. The value contains the identifier of a VirtualStorageResourceInfo item that has been removed from the VNFC, and might no longer exist in the VnfInstance. It shall be provided if at least one storage resource was removed from the VNFC.\n",
+                "items": {
+                  "type": "string",
+                  "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                }
+              }
+            }
+          }
+        },
+        "affectedVirtualLinks": {
+          "type": "array",
+          "description": "Information about VL instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
+          "items": {
+            "type": "object",
+            "description": "This type provides information about added, deleted, modified and temporary VLs.\n",
+            "required": [
+              "id",
+              "virtualLinkDescId",
+              "changeType",
+              "networkResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "virtualLinkDescId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "changeType": {
+                "type": "string",
+                "enum": [
+                  "ADDED",
+                  "REMOVED",
+                  "MODIFIED",
+                  "TEMPORARY",
+                  "LINK_PORT_ADDED",
+                  "LINK_PORT_REMOVED"
+                ],
+                "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY * LINK_PORT_ADDED * LINK_PORT_REMOVED For a temporary resource, an AffectedVirtualLink structure exists as long as the temporary resource exists.\n"
+              },
+              "networkResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "metadata": {
+                "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"
+              }
+            }
+          }
+        },
+        "affectedVirtualStorages": {
+          "type": "array",
+          "description": "Information about virtualised storage instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
+          "items": {
+            "type": "object",
+            "description": "This type provides information about added, deleted, modified and temporary virtual storage resources.\n",
+            "required": [
+              "id",
+              "virtualStorageDescId",
+              "changeType",
+              "storageResource"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+              },
+              "virtualStorageDescId": {
+                "type": "string",
+                "description": "An identifier that is unique within a VNF descriptor.\n"
+              },
+              "changeType": {
+                "type": "string",
+                "enum": [
+                  "ADDED",
+                  "REMOVED",
+                  "MODIFIED",
+                  "TEMPORARY"
+                ],
+                "description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVirtualStorage structure exists as long as the temporary resource exists.\n"
+              },
+              "storageResource": {
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "required": [
+                  "vimConnectionId",
+                  "resourceId"
+                ],
+                "properties": {
+                  "vimConnectionId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceProviderId": {
+                    "type": "string",
+                    "description": "An identifier with the intention of being globally unique.\n"
+                  },
+                  "resourceId": {
+                    "type": "string",
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                  },
+                  "vimLevelResourceType": {
+                    "type": "string",
+                    "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                  }
+                }
+              },
+              "metadata": {
+                "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"
+              }
+            }
+          }
+        }
+      }
+    },
+    "changedInfo": {
+      "type": "object",
+      "description": "This type represents attribute modifications that were performed on an \"Individual VNF instance\" resource. The attributes that can be included consist of those requested to be modified explicitly in the \"VnfInfoModificationRequest\" data structure, and additional attributes of the \"VnfInstance\" data structure that were modified implicitly e.g. when modifying the referenced VNF package.\n",
+      "properties": {
+        "vnfInstanceName": {
+          "type": "string",
+          "description": "If present, this attribute signals modifications of the \"vnfInstanceName\" attribute in \"VnfInstance\".\n"
+        },
+        "vnfInstanceDescription": {
+          "type": "string",
+          "description": "If present, this attribute signals modifications of the \"vnfInstanceDescription\" attribute in \"VnfInstance\".\n"
+        },
+        "vnfConfigurableProperties": {
+          "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"
+        },
+        "metadata": {
+          "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"
+        },
+        "extensions": {
+          "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"
+        },
+        "vimConnectionInfo": {
+          "type": "array",
+          "description": "If present, this attribute signals modifications of certain entries in the \"vimConnectionInfo\" attribute array in \"VnfInstance\".\n",
+          "items": {
+            "type": "object",
+            "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
+            "required": [
+              "id",
+              "vimType"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "vimId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "vimType": {
+                "type": "string",
+                "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n"
+              },
+              "interfaceInfo": {
+                "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"
+              },
+              "accessInfo": {
+                "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"
+              },
+              "extra": {
+                "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"
+              }
+            }
+          }
+        },
+        "vnfPkgId": {
+          "type": "string",
+          "description": "An identifier with the intention of being globally unique.\n"
+        },
+        "vnfdId": {
+          "type": "string",
+          "description": "An identifier with the intention of being globally unique.\n"
+        },
+        "vnfProvider": {
+          "type": "string",
+          "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"
+        },
+        "vnfProductName": {
+          "type": "string",
+          "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"
+        },
+        "vnfSoftwareVersion": {
+          "type": "string",
+          "description": "A Version.\n"
+        },
+        "vnfdVersion": {
+          "type": "string",
+          "description": "A Version.\n"
+        }
+      }
+    },
+    "changedExtConnectivity": {
+      "type": "array",
+      "description": "Information about changed external connectivity, if applicable. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
+      "items": {
+        "type": "object",
+        "required": [
+          "id",
+          "resourceHandle"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "An identifier with the intention of being globally unique.\n"
+          },
+          "resourceHandle": {
+            "type": "object",
+            "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+            "required": [
+              "vimConnectionId",
+              "resourceId"
+            ],
+            "properties": {
+              "vimConnectionId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "resourceProviderId": {
+                "type": "string",
+                "description": "An identifier with the intention of being globally unique.\n"
+              },
+              "resourceId": {
+                "type": "string",
+                "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+              },
+              "vimLevelResourceType": {
+                "type": "string",
+                "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+              }
+            }
+          },
+          "extLinkPorts": {
+            "type": "array",
+            "description": "Link ports of this VL.\n",
+            "items": {
+              "type": "object",
+              "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL. \n",
+              "required": [
+                "id",
+                "resourceHandle"
+              ],
+              "properties": {
+                "id": {
+                  "type": "string",
+                  "description": "An identifier with the intention of being globally unique.\n"
+                },
+                "resourceHandle": {
+                  "type": "object",
+                  "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                  "required": [
+                    "vimConnectionId",
+                    "resourceId"
+                  ],
+                  "properties": {
+                    "vimConnectionId": {
+                      "type": "string",
+                      "description": "An identifier with the intention of being globally unique.\n"
+                    },
+                    "resourceProviderId": {
+                      "type": "string",
+                      "description": "An identifier with the intention of being globally unique.\n"
+                    },
+                    "resourceId": {
+                      "type": "string",
+                      "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
+                    },
+                    "vimLevelResourceType": {
+                      "type": "string",
+                      "description": "Type of the resource in the scope of the VIM or the resource provider.\n"
+                    }
+                  }
+                },
+                "cpInstanceId": {
+                  "type": "string",
+                  "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "_links": {
+      "type": "object",
+      "description": "Links to resources related to this resource.\n",
+      "required": [
+        "self",
+        "vnfInstance"
+      ],
+      "properties": {
+        "self": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "vnfInstance": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "grant": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "cancel": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "retry": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "rollback": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        },
+        "fail": {
+          "type": "object",
+          "description": "This type represents a link to a resource.\n",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "type": "string",
+              "description": "URI of the referenced resource.\n",
+              "format": "url"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
-- 
GitLab