X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FNicKeywords.robot;h=efb208940c82321c2d9d4c05f862d6346baf0f9c;hb=036fc30e6aaa7538b0bf17aae41ffd808a4e550b;hp=14f42a4e820f5363694fd27148193dd7a8c80f2b;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git

diff --git a/csit/libraries/NicKeywords.robot b/csit/libraries/NicKeywords.robot
index 14f42a4e82..efb208940c 100644
--- a/csit/libraries/NicKeywords.robot
+++ b/csit/libraries/NicKeywords.robot
@@ -6,8 +6,8 @@ Library           Collections
 Library           json
 Library           RequestsLibrary
 Variables         ../variables/Variables.py
-Resource          ./Utils.robot
-Resource          Scalability.robot
+Resource          Utils.robot
+Resource          WorkflowsOpenFlow.robot
 
 *** Variables ***
 ${switches}       2
@@ -19,7 +19,7 @@ ${INTENT_ID}      b9a13232-525e-4d8c-be21-cd65e3436033
 *** Keywords ***
 Start NIC VTN Renderer Suite
     [Documentation]    Start Nic VTN Renderer Init Test Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     BuiltIn.Wait_Until_Keyword_Succeeds    30    3    Fetch Intent List
 
 Stop NIC VTN Renderer Suite
@@ -28,41 +28,41 @@ Stop NIC VTN Renderer Suite
 
 Start NIC VTN Rest Test Suite
     [Documentation]    Start Nic VTN Renderer Rest Test Suite
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     Clean Mininet System
     Start Mininet Linear    ${switches}
 
 Stop NIC VTN Rest Test Suite
     [Documentation]    Stop Nic VTN Renderer Test Suite
-    Stop Mininet    ${mininet_conn_id}
+    Stop Mininet Simulation
 
 Fetch Intent List
     [Documentation]    Check if VTN Renderer feature is installed.
-    ${resp}=    RequestsLibrary.Get    session    ${INTENTS}
+    ${resp}=    RequestsLibrary.Get Request    session    ${INTENTS}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Intent Using RestConf
     [Arguments]    ${intent_id}    ${intent_data}
     [Documentation]    Create a intent with specified parameters.
-    ${resp}=    RequestsLibrary.put    session    ${REST_CONTEXT_INTENT}/${intent_id}    data=${intent_data}
+    ${resp}=    RequestsLibrary.put Request    session    ${REST_CONTEXT_INTENT}/${intent_id}    data=${intent_data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify Intent Using RestConf
     [Arguments]    ${intent_id}
     [Documentation]    Verify If intent is created.
-    ${resp}=    RequestsLibrary.Get    session    ${REST_CONTEXT_INTENT}/${intent_id}
+    ${resp}=    RequestsLibrary.Get Request    session    ${REST_CONTEXT_INTENT}/${intent_id}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Update Intent Using RestConf
     [Arguments]    ${intent_id}    ${intent_data}
     [Documentation]    Update a intent with specified parameters.
-    ${resp}=    RequestsLibrary.put    session    ${REST_CONTEXT_INTENT}/${intent_id}    data=${intent_data}
+    ${resp}=    RequestsLibrary.put Request    session    ${REST_CONTEXT_INTENT}/${intent_id}    data=${intent_data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Delete Intent Using RestConf
     [Arguments]    ${intent_id}
     [Documentation]    Delete a intent with specified parameters.
-    ${resp}=    RequestsLibrary.Delete    session    ${REST_CONTEXT_INTENT}/${intent_id}
+    ${resp}=    RequestsLibrary.Delete Request    session    ${REST_CONTEXT_INTENT}/${intent_id}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Intent From Karaf Console
@@ -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 in same.
+    #Should Contain    ${output}    Removed VTN configuration associated with the deleted Intent    ${id}
 
 Mininet Ping Should Succeed
     [Arguments]    ${host1}    ${host2}
@@ -93,6 +94,6 @@ Mininet Ping Should Succeed
 Mininet Ping Should Not Succeed
     [Arguments]    ${host1}    ${host2}
     [Timeout]    2 minute
-    Write    ${host1} ping -c 10 ${host2}
+    Write    ${host1} ping -c 3 ${host2}
     ${result}    Read Until    mininet>
     Should Not Contain    ${result}    64 bytes