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

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

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