reverted bad fix of issue #164 on v2.6.1

SOL005/NSDManagement-API/NSDManagementKeywords.robot

@@ -15,12 +15,7 @@ Library    JSONSchemaLibrary    schemas/
 Library    Process
 Library    String
 
-*** Keywords ***
-Setup environment
-    Run Keyword If    ${NFVO_DUPLICATION} == 0    Set Tags    no-duplicated-subs    
-    Run Keyword If    ${NFVO_DUPLICATION} == 1    Set Tags    duplicated-subs
-    Create Sessions
-        
+*** Keywords ***        
 GET all Network Service Descriptors Information
     Log    The GET method queries multiple NS descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -849,6 +844,7 @@ Send Post Request for NSD Management Subscription
 
 Send Post Request for Duplicated NSD Management Subscription
     Log    Trying to create a subscription with an already created content
+    Pass Execution If    ${NFVO_DUPLICATION} == 0    NFVO is not permitting duplication. Skipping the test
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

SOL005/NSDManagement-API/Subscriptions.robot

@@ -7,7 +7,7 @@ Library           OperatingSystem
 Library           JSONLibrary
 Library           Process
 Library           REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Suite Setup       Create Sessions    Create Tag
+Suite Setup       Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
@@ -78,7 +78,7 @@ Create new NSD Management subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    NsdmSubscription
     Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition NSD Management Subscription Is Set 
+    Check Postcondition NSD Management Subscription Is Set
     
 
 Create duplicated NSD Management subscription with NFVO not creating duplicated subscriptions
@@ -112,7 +112,7 @@ Create duplicated NSD Management subscription with NFVO creating duplicated subs
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    NsdmSubscription
     Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
-    Check Postcondition NSD Management Subscription Is Set 
+    Check Postcondition NSD Management Subscription Is Set
 
 
 PUT NSD Management Subscriptions - Method not implemented