From e5c19d1197ee64d2f3dea5235b7c049728ccb97c Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 27 Aug 2020 13:45:34 +0500
Subject: [PATCH] fixed issues

---
 .../CompileLogTask.robot                      | 28 +++++++++----------
 .../IndividualLoggingJob.robot                |  5 ++--
 .../IndividualReport.robot                    |  1 +
 .../LoggingJobs.robot                         |  8 +++---
 .../NFVMANOLogManagementKeywords.robot        |  6 ++--
 .../Subscriptions.robot                       |  2 --
 6 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
index d7a15dae..c4fd5b4c 100644
--- a/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
+++ b/SOL009/NFVMANOLogManagement-API/CompileLogTask.robot
@@ -12,7 +12,7 @@ Request to compile the logged data into a file - Synchronous mode
     [Documentation]    Test ID: 8.3.4.4.1
     ...    Test title: Request to compile the logged data into a file - Synchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in synchronous mode and perform a JSON schema validation on the returned log report data structure
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can decide immediately what to respond to a compile request
@@ -27,7 +27,7 @@ Request to compile the logged data into a file - Asynchronous mode
     [Documentation]    Test ID: 8.3.4.4.2
     ...    Test title: Request to compile the logged data into a file - Asynchronous mode
     ...    Test objective: The objective is to request to compile the logged data into a file in asynchronous mode and perform a JSON schema validation on the returned log report data structure
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: The NFV-MANO can not decide immediately what to respond to a compile request
@@ -41,11 +41,11 @@ Request to compile the logged data into a file - Already Processing
     [Documentation]    Test ID: 8.3.4.4.3
     ...    Test title: Request to compile the logged data into a file - Already Processing
     ...    Test objective: The objective is to request to compile the logged data into a file when a log data compilation and report creation is already ongoing, or a log report has just been created, for the specified logging job at the time of processing the request and perform a JSON schema validation on the returned log report data structure
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions: 
+    ...    Applicability: none
+    ...    Post-Conditions: none
     Send Log data Request
     Check HTTP Response Status Code Is    303
     Check Operation Occurrence Id
@@ -54,7 +54,7 @@ Request to compile the logged data into a file with unprocessable entity
         [Documentation]    Test ID: 8.3.4.4.4
     ...    Test title: Request to compile the logged data into a file with unprocessable entity
     ...    Test objective:  The objective is to test that the rrequest to compile the logged data into a file fails when error in request body. 
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
@@ -67,11 +67,11 @@ GET Compiled Log Data - Method not implemented
     [Documentation]    Test ID: 8.3.4.4.5
     ...    Test title: GET Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that GET method is not allowed to retrieve compiled log data.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send Get Compiled Log Data
     Check HTTP Response Status Code Is    405
     
@@ -79,11 +79,11 @@ PUT Compiled Log Data - Method not implemented
     [Documentation]    Test ID: 8.3.4.4.6
     ...    Test title: PUT Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update compiled log data.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.3 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send PUT Compiled Log Data
     Check HTTP Response Status Code Is    405
     
@@ -91,11 +91,11 @@ PATCH Compiled Log Data - Method not implemented
     [Documentation]    Test ID: 8.3.4.4.7
     ...    Test title: PATCH Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update compiled log data.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.4 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send PATCH Compiled Log Data
     Check HTTP Response Status Code Is    405
     
@@ -103,11 +103,11 @@ DELETE Compiled Log Data - Method not implemented
     [Documentation]    Test ID: 8.3.4.4.8
     ...    Test title: DELETE Compiled Log Data - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update compiled log data.
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.6.3.5 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
-    ...    Post-Conditions: 
+    ...    Post-Conditions: none
     Send DELETE Compiled Log Data
     Check HTTP Response Status Code Is    405
     
\ No newline at end of file
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
index 2d389167..c63498ea 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualLoggingJob.robot
@@ -11,7 +11,7 @@ POST Individual Logging Job - Method not implemented
     [Documentation]    Test ID: 8.3.4.2.1
     ...    Test title: POST Individual Logging Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an Indiviual Logging
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.4.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
@@ -31,7 +31,7 @@ GET individual Logging Job
     ...    Post-Conditions: none
     GET individual Logging Job
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   PmJob
+    Check HTTP Response Body Json Schema Is   LoggingJob
     Check HTTP Response Body Logging Job Identifier matches the requested Logging Job
 
 GET individual Logging Job with invalid resource identifier
@@ -95,3 +95,4 @@ DELETE Individual Logging Job with invalid resource identifier
     ...    Post-Conditions: none
     Send Delete request for individual Logging Job with invalid resource identifier
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
diff --git a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
index 66a8e04a..e85b2ecf 100644
--- a/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
+++ b/SOL009/NFVMANOLogManagement-API/IndividualReport.robot
@@ -56,6 +56,7 @@ Get Individual Log Report with invalid resource endpoint
     ...    Post-Conditions: none
     Get Individual Log Report with invalid resource endpoint
     Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
 
 PUT Individual Log Report - Method not implemented
     [Documentation]    Test ID: 8.3.4.3.5
diff --git a/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
index dc4b136d..97cbed71 100644
--- a/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
+++ b/SOL009/NFVMANOLogManagement-API/LoggingJobs.robot
@@ -11,10 +11,10 @@ POST Create a new logging job
     [Documentation]    Test ID: 8.3.4.1.1
     ...    Test title: POST Create a new logging job
     ...    Test objective: The objective is to create a new logging job
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 8.5.3.3.1 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
+    ...    Applicability: none
     ...    Post-Conditions: logging job created
     POST Create a new logging job
     Check HTTP Response Status Code Is    201
@@ -28,8 +28,8 @@ GET information about logging jobs
     ...    Pre-conditions: At least one logging job is created.
     ...    Reference: clause 8.5.3.3.2 - ETSI GS NFV-SOL 009 [5] V3.3.1
     ...    Config ID: Config_prod_NFV-MANO
-    ...    Applicability: 
-    ...    Post-Conditions:  
+    ...    Applicability: none
+    ...    Post-Conditions:  none
     GET Logging Jobs
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    LoggingJobs
diff --git a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
index 198f96f6..09c6698a 100644
--- a/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
+++ b/SOL009/NFVMANOLogManagement-API/NFVMANOLogManagementKeywords.robot
@@ -99,7 +99,7 @@ GET Logging Jobs with fields attribute selector
     Set Suite Variable    ${response}    ${output}
     
 GET Logging Jobs with exclude_fields attribute selector
-    Log    Query VNF The GET method queries information about multiple alarms, using fields
+    Log    Query NFV-MANO The GET method queries information about multiple alarms, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs?exclude_fields=${fields}
@@ -150,7 +150,7 @@ Check Postcondition Logging Job is not Created
     Check HTTP Response Status Code Is    404
 
 GET individual Logging Job
-    Log    Trying to get a Pm Job 
+    Log    Trying to get a Logging Job 
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs/${logJobId}
@@ -413,8 +413,6 @@ Send Post Request for Subscription
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
-    Run Keyword If    ${NFVMANO_CHECKS_NOTIF_ENDPOINT} == 1
-    ...       Check Notification Endpoint
 
 Check HTTP Response Body LogmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
diff --git a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
index 2e92a3ab..eb6be70c 100644
--- a/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
+++ b/SOL009/NFVMANOLogManagement-API/Subscriptions.robot
@@ -89,7 +89,6 @@ GET Subscriptions - invalid resource endpoint
     Get all Subscriptions
     Check HTTP Response Status Code Is    404
     
-    
 Create new Subscription
     [Documentation]    Test ID 8.3.4.5.7
     ...    Test title: Create new Subscription
@@ -105,7 +104,6 @@ Create new Subscription
     Check HTTP Response Body LogmSubscription Attributes Values Match the Issued Subscription
     Check Postcondition Subscription Is Set 
 
-
 Create request for duplicated Subscription not creating duplicated subscriptions
     [Tags]    no-duplicated-subs
     [Documentation]    Test ID 8.3.4.5.8
-- 
GitLab