Fix on issues: 66, 69, 73 (NXW endpoints), 74, 76, 78, 79, 80, 81, 85, 87, 88

SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot

@@ -34,7 +34,7 @@ Scale a vnfInstance to level Conflict (Not-Instantiated)
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/scaleVnfToLevelRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale_to_level    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale_to_level    ${body}
     Integer    response status    409
     Log    Status code validated
     ${problemDetails}=    Output    response body

SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot

@@ -35,7 +35,7 @@ Terminate a vnfInstance Conflict (Not-Instantiated)
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/terminateVnfRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/terminate    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/terminate    ${body}
     Integer    response status    409
     Log    Status code validated
     ${problemDetails}=    Output    response body

SOL003/VNFLifecycleManagement-API/environment/variables.txt

@@ -21,7 +21,7 @@ ${requestedFlavour}    test
 ${sub_filter}    filter
 ${sub_filter_invalid}    filter_invalid
 
-
+${notInstantiatedVnfInstanceId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 
 
 

SOL003/VNFLifecycleOperationGranting-API/Grants.robot

@@ -12,6 +12,7 @@ ${response}    {}
 
 *** Test Cases ***
 Request a new Grant - Synchronous mode
+    [Tags]    synchronous-mode
     [Documentation]    Test ID: 9.4.2.1
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - Synchronous mode
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation 
@@ -29,6 +30,7 @@ Request a new Grant - Synchronous mode
     Log    Validation OK
 
 Request a new Grant - Asynchronous mode
+    [Tags]    no-synchronous-mode
     [Documentation]    Test ID: 9.4.2.2
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - Asynchronous mode
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation 
@@ -42,7 +44,7 @@ Request a new Grant - Asynchronous mode
     Send Request Grant Request
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Body Json Schema Is    grant.schema.json
+    #Check HTTP Response Body Json Schema Is    grant.schema.json
     Wait Until Keyword Succeeds    2 min   10 sec    Get an individual grant - Successful
     Log    Validation OK
 
@@ -108,33 +110,35 @@ Send Request Grant Request
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=    Get File    jsons/grantRequest.json
-    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}
-    ${body}=    Output    response
-    Set Suite Variable    &{response}    ${body}
+    Post    ${apiRoot}/${apiName}/${apiVersion}/grants    ${body}    allow_redirects=false
+    ${resp}    Output    response
+    ${result}=    evaluate    json.loads(json.dumps(${resp}))    json
+    Log  ${result}
+    Set Suite Variable    ${response}    ${result}
 
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
-    Should Be Equal as Strings   ${response[0]['status_code']}    ${expected_status}
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
-    Should Contain    ${response[0]['headers']}    ${CONTENT_TYPE}
+    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${schema}
-    Validate Json    ${schema}    ${response[0]['body']}
+    Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
     
 Get an individual grant - Successful
     log    Trying to read an individual grant
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${response[0]['headers']['Location']}
+    Get    ${response['headers']['Location']}
     Log    Validate Status code
     Integer    response status    200
-    ${result}=    Output    response body
+    ${result}    Output    response body
     Validate Json    grant.schema.json    ${result}
     Log    Validation OK
 

SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot

@@ -39,6 +39,7 @@ Get an individual grant - Successful
     Log    Validation OK
     
 Get an individual grant - Process ongoing
+    [Tags]    no-synchronous-mode
     [Documentation]    Test ID: 9.4.3.2
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - Process ongoing
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation 
@@ -48,6 +49,7 @@ Get an individual grant - Process ongoing
     ...    Applicability: 
     ...    Post-Conditions: 
     log    Trying to read an individual grant
+    Pass Execution If    ${SYNC_MODE} == 1   Skipping. Synchronous mode is supported    
     Set Headers    {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/grants/${grantId}
@@ -55,6 +57,7 @@ Get an individual grant - Process ongoing
     Integer    response status    202
 
 Get an individual grant - grant rejected
+    [Tags]    no-synchronous-mode
     [Documentation]    Test ID: 9.4.3.3
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - grant rejected
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation 

SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot

@@ -19,6 +19,7 @@ GET Individual VNF Package Artifact
     GET Individual VNF Package Artifact
     Check HTTP Response Status Code Is    200
 
+
 GET Individual VNF Package Artifact in octet stream format
     [Documentation]    Test ID: 7.3.3.5.2
     ...    Test title: GET Individual VNF Package Artifact in octet stream format

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

@@ -619,7 +619,7 @@ Check HTTP Response Status Code Is
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
 
@@ -647,8 +647,10 @@ Check Postcondition VNF Package Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    Run Keyword If    Should Not Be Equal As Strings    ${location}    Location   GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
-    Run Keyword If    Should Be Equal As Strings    ${location}    Location   GET    ${response['headers']['Location']}  
+    Run Keyword If    ${location} == Location
+    ...    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    Run Keyword If    ${location} == Location
+    ...    GET    ${response['headers']['Location']}  
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -656,7 +658,7 @@ Check Postcondition VNF Package Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response.headers['Location']}
+    GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -745,7 +747,7 @@ Check Postcondition VNF Package Subscription is not Created
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
-    Should Contain    ${response.headers}    ${CONTENT_TYPE}
+    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
 
 Check HTTP Response Body Subscription Identifier matches the requested Subscription

SOL003/VNFPackageManagement-API/schemas/userDefinedData.schema.json

+{
+  "description": "",
+  "type": "object"
+}
\ No newline at end of file

SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot

@@ -199,6 +199,6 @@ Check HTTP Response Header Contains
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK

SOL003/VNFPerformanceManagement-API/IndividualReport.robot

@@ -168,7 +168,7 @@ Check HTTP Response Header Contains
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
 

SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot

@@ -198,6 +198,6 @@ Check HTTP Response Header Contains
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK

SOL003/VNFPerformanceManagement-API/PMJobs.robot

@@ -295,7 +295,7 @@ Check HTTP Response Body PmJobs Matches the requested exclude_fields selector
 Check HTTP Response Body PmJobs Matches the requested fields selector
     Log    Trying to validate criteria schema
     ${criteria}=    Get Value From Json    ${response['body']}    $..criteria
-    Validate Json    criteria.schema.json    ${criteria[0]}
+    Validate Json    criteria.schema.json    ${criteria}
     Log    Validation for criteria schema OK
     Log    Trying to validate criteria schema
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
@@ -311,7 +311,7 @@ Check HTTP Response Body PmJobs Matches the requested exclude_default selector
 Check HTTP Response Body PmJobs Matches the requested all_fields selector
     Log    Trying to validate criteria schema
     ${criteria}=    Get Value From Json    ${response['body']}    $..criteria
-    Validate Json    criteria.schema.json    ${criteria[0]}
+    Validate Json    criteria.schema.json    ${criteria}
     Log    Validation for criteria schema OK
     Log    Trying to validate criteria schema
     ${reports}=    Get Value From Json    ${response['body']}    $..reports
@@ -350,6 +350,6 @@ Check HTTP Response Header Contains
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK

SOL003/VNFPerformanceManagement-API/Thresholds.robot

@@ -211,7 +211,7 @@ Check HTTP Response Header Contains
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
 

SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

@@ -239,8 +239,8 @@ Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
     GET individual VNF Performance Subscription
     Log    Check Response matches original VNF Threshold
     ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
-    Should Be Equal    ${origResponse['body']['id']}    ${subscription.id}
-    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
+    Should Be Equal As Strings    ${origResponse['body']['id']}    ${subscription.id}
+    Should Be Equal As Strings    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
 
 Check Postcondition VNF Performance Subscription is not Created
     Log    Trying to get a new subscription
@@ -258,12 +258,12 @@ Check Postcondition VNF Performance Subscription is Deleted
 
 Check HTTP Response Body Subscription Identifier matches the requested Subscription
     Log    Trying to check response ID
-    Should Be Equal    ${response['body']['id']}    ${subscriptionId} 
+    Should Be Equal As Strings   ${response['body']['id']}    ${subscriptionId} 
     Log    Subscription identifier as expected
     
 Check HTTP Response Status Code Is
     [Arguments]    ${expected_status}    
-    Should Be Equal    ${response['status']}    ${expected_status}
+    Should Be Equal As Strings    ${response['status']}    ${expected_status}
     Log    Status code validated 
     
     
@@ -271,7 +271,7 @@ Check HTTP Response Status Code Is
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    ${input}    .schema.json
+    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
 
@@ -290,7 +290,7 @@ Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subsc
     Log    Check Response matches subscription
     ${body}=    Get File    jsons/subscriptions.json
     ${subscription}=    evaluate    json.loads('''${body}''')    json
-    Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
+    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
 Check Postcondition VNF Performance Subscription Is Set
     Log    Check Postcondition subscription exist
@@ -304,7 +304,7 @@ Check Postcondition VNF Performance Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response.headers['Location']}
+    GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -319,12 +319,12 @@ Check Postcondition VNF Performance Subscriptions Exists
 
 Check HTTP Response Header Contains
     [Arguments]    ${CONTENT_TYPE}
-    Should Contain    ${response.headers}    ${CONTENT_TYPE}
+    Should Contain    ${response['headers']}    ${CONTENT_TYPE}
     Log    Header is present
 
 Check HTTP Response Location Header Resource URI
     Log    Going to check
-    GET    ${response.headers['Location']}
+    GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type

SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json

@@ -4,7 +4,6 @@
 		"performanceMetric": [],
 		"performanceMetricGroup": [],
 		"collectionPeriod": 10,
-		"reportingPeriod": 30,
-		
+		"reportingPeriod": 30
 	}
 }
\ No newline at end of file

SOL005/NSDManagement-API/IndividualNSDescriptor.robot

@@ -25,6 +25,7 @@ GET Individual Network Service Descriptor Information
     Check HTTP Response Header Contains ETag
     Check HTTP Response Body NsdInfo Identifier matches the requested Network Service Descriptor Information
 
+
 GET Individual Network Service Descriptor Information with invalid resource identifier
     [Documentation]    Test ID: 5.3.1.2.2
     ...    Test title: GET Individual Network Service Descriptor Information with invalid resource identifier
@@ -37,6 +38,8 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     GET Individual Network Service Descriptor Information with invalid resource identifier
     Check HTTP Response Status Code Is    404
 
+
+
 Disable Individual Network Service Descriptor   
     [Documentation]    Test ID: 5.3.1.2.3
     ...    Test title: Disable Individual Network Service Descriptor  
@@ -155,5 +158,3 @@ PUT Individual Network Service Descriptor - Method not implemented
     ...    Post-Conditions: none
     Send PUT Request for Individual Network Service Descriptor
     Check HTTP Response Status Code Is    405
-
-

SOL005/NSDManagement-API/NSDContent.robot

@@ -162,7 +162,7 @@ Upload NSD Content as plain text file in asynchronous mode
     ...    Post-Conditions: none
     Send PUT Request to upload NSD Content as plain text file in asynchronous mode
     Check HTTP Response Status Code Is    202   
-    
+   
 Upload NSD Content as Zip file in synchronous mode
     [Documentation]    Test ID: 5.3.1.3.13
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
@@ -188,6 +188,7 @@ Upload NSD Content as plain text file in synchronous mode
     Send PUT Request to upload NSD Content as plain text file in synchronous mode
     Check HTTP Response Status Code Is    204 
     Check Postcondition NSD Content is uploaded and available in the NFVO
+
  
 Upload NSD Content with conflict due to onboarding state
    [Documentation]    Test ID: 5.3.1.3.15

SOL005/NSDManagement-API/NSDManagementKeywords.robot

@@ -81,7 +81,7 @@ GET all Network Service Descriptors Information with all_fields attribute select
 
 Check HTTP Response Body NsdInfos Matches the requested all_fields selector
     Log    Validating user defined data schema
-    ${user}=    Get Value From Json    ${response['body']}    $..UserDefinedData
+    ${user}=    Get Value From Json    ${response['body']}    $..userDefinedData
     Validate Json    UserDefinedData.schema.json    ${user[0]}
     Log    Validation for schema OK
 
@@ -95,7 +95,7 @@ GET all Network Service Descriptors Information with exclude_default attribute s
 
 Check HTTP Response Body NsdInfos Matches the requested exclude_default selector
     Log    Checking that element is missing
-    ${user}=    Get Value From Json    ${response['body']}    $..UserDefinedData
+    ${user}=    Get Value From Json    ${response['body']}    $..userDefinedData
     Should Be Empty    ${user}
     Log    Reports element is empty as expected
 
@@ -110,7 +110,7 @@ GET all Network Service Descriptors Information with fields attribute selector
 
 Check HTTP Response Body NsdInfos Matches the requested fields selector
     Log    Validating user defined data schema
-    ${user}=    Get Value From Json    ${response['body']}    $..UserDefinedData
+    ${user}=    Get Value From Json    ${response['body']}    $..userDefinedData
     Validate Json    UserDefinedData.schema.json    ${user[0]}
     Log    Validation for schema OK