From: vinoth <m.vinoth@hcl.com>
Date: Fri, 12 Feb 2016 19:50:49 +0000 (+0530)
Subject: Fix for NIC CSIT in beryllium
X-Git-Tag: release/beryllium-sr1~82
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=9d3e22f23b5b9fc62ba30cba1520cbce7ac2905a

Fix for NIC CSIT in beryllium

Change-Id: I809233559a4382a062c2b02af6faa541c65dc9c2
Signed-off-by: vinoth <m.vinoth@hcl.com>
---

diff --git a/csit/libraries/NicKeywords.robot b/csit/libraries/NicKeywords.robot
index 7e142861fd..c2fd846acc 100644
--- a/csit/libraries/NicKeywords.robot
+++ b/csit/libraries/NicKeywords.robot
@@ -80,8 +80,9 @@ Remove Intent From Karaf Console
     [Documentation]    Removes an intent from the controller via the provided intent id.
     ${output}=    Issue Command On Karaf Console    intent:remove ${id}
     Should Contain    ${output}    Intent successfully removed
-    ${output}=    Issue Command On Karaf Console    log:display |grep "Removed VTN configuration associated with the deleted Intent: "
-    Should Contain    ${output}    Removed VTN configuration associated with the deleted Intent    ${id}
+    ${output}=    Issue Command On Karaf Console    log:display | grep "Removed VTN configuration associated with the deleted Intent: "
+    # The below log statements has changed an info to trace mode in Beryllium, and in future release will roll back the same.
+    #Should Contain    ${output}    Removed VTN configuration associated with the deleted Intent    ${id}
 
 Mininet Ping Should Succeed
     [Arguments]    ${host1}    ${host2}
diff --git a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot
index 431dfa18e7..2e0e352d3e 100644
--- a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot
+++ b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot
@@ -60,9 +60,8 @@ Verify VTNBundle
     Should Contain    ${output}    Active
 
 Setup NIC Console Environment
-    [Documentation]    Installing NIC Console related features (odl-nic-core-mdsal, odl-nic-console, odl-nic-console)
+    [Documentation]    Installing NIC Console related features (odl-nic-core-mdsal, odl-nic-renderer-vtn)
     Verify Feature Is Installed    odl-nic-core-mdsal
-    Verify Feature Is Installed    odl-nic-console
     Verify Feature Is Installed    odl-nic-renderer-vtn
     Clean Mininet System
     Start Mininet Linear    ${switches}
diff --git a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot
index ca5f202d3e..e5e6bf231d 100644
--- a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot
+++ b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/NicKeywords.robot
 *** Test Cases ***
 Add Intent
     [Documentation]    Create a new intent .
-    Add Intent Using RestConf    ${INTENT_ID}    { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 1, "block" : {} } ],"intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } }
+    Add Intent Using RestConf    ${INTENT_ID}    { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 1, "block" : {} } ], "intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } }
 
 Verify Intent
     [Documentation]    Verify the Intent created.
@@ -15,7 +15,7 @@ Verify Intent
 
 Update Intent
     [Documentation]    Update the Intent created.
-    Update Intent Using RestConf    ${INTENT_ID}    { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 2, "allow" : {} } ],"intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } }
+    Update Intent Using RestConf    ${INTENT_ID}    { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 2, "allow" : {} } ], "intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } }
 
 Verify Ping
     [Documentation]    Ping h1 to h2, to verify no packet loss