From 3418497d97a6deec6c435359e553ad9d7fe78062 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 27 Jun 2014 10:59:09 -0700
Subject: [PATCH] Fix Master adaptors change

Change-Id: I0bd41fe30ae9715f6138ad3e15f6f210947c6b32
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 .../030__AD_SAL_NSF/010__switch_manager.txt   | 45 +++++++++----------
 .../020__statistics_manager.txt               |  6 +--
 .../030__AD_SAL_NSF/030__topology_manager.txt | 10 ++---
 .../030__AD_SAL_NSF/040__flow_programmer.txt  | 25 ++++++-----
 .../010__switch_manager.txt                   | 45 +++++++++----------
 .../020__statistics_manager.txt               |  8 ++--
 .../030__topology_manager.txt                 | 10 ++---
 .../040__flow_programmer.txt                  | 25 ++++++-----
 .../050__AD_SAL_Apps/010__host_tracker.txt    | 20 ++++-----
 .../050__AD_SAL_Apps/020__static_route.txt    |  7 +--
 .../010__host_tracker.txt                     | 20 ++++-----
 .../020__static_route.txt                     |  5 ++-
 12 files changed, 114 insertions(+), 112 deletions(-)

diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
index 30cd4eb793..be2f4c5911 100644
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
@@ -7,13 +7,12 @@ Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Library           ../../../libraries/SwitchManager.py
 Variables         ../../../variables/Variables.py
-Library           ../../../libraries/Topologynew.py
+Library           ../../../libraries/Topology.py
 
 *** Variables ***
 ${REST_CONTEXT}    /controller/nb/v2/switchmanager
 
 *** Test Cases ***
-
 List all nodes
     [Documentation]    List all nodes and their properties in the network.
     [Tags]    list_info
@@ -27,49 +26,49 @@ List all nodes
 Check node 1 connectors 
     [Documentation]    List node connectors and verify all connectors are there
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:1
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:1:1
-    Should Contain     ${resp.content}    openflow:1:2
+    Should Contain     ${resp.content}    s1-eth1
+    Should Contain     ${resp.content}    s1-eth2
 Check node 2 connectors               
     [Documentation]    List node connectors and verify all connectors are there                      
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:2
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:2:1              
-    Should Contain     ${resp.content}    openflow:2:2  
-    Should Contain     ${resp.content}    openflow:2:3
+    Should Contain     ${resp.content}    s2-eth1             
+    Should Contain     ${resp.content}    s2-eth2  
+    Should Contain     ${resp.content}    s2-eth3
 Check node 3 connectors               
     [Documentation]    List node connectors and verify all connectors are there                      
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:3
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:3:1              
-    Should Contain     ${resp.content}    openflow:3:2  
-    Should Contain     ${resp.content}    openflow:3:3
+    Should Contain     ${resp.content}    s3-eth1           
+    Should Contain     ${resp.content}    s3-eth2
+    Should Contain     ${resp.content}    s3-eth3
 Add property to node
     [Documentation]    Add a property to node
-    Add property to node    MD_SAL    openflow:2    description     Switch2
-    Node property should exist    MD_SAL    openflow:2    description    Switch2
-#    Standing bug #335 - This has been fixed!
+    Add property to node    OF    00:00:00:00:00:00:00:02    description     Switch2
+    Node property should exist    OF    00:00:00:00:00:00:00:02    description    Switch2
 #Remove property from node
 #    [Documentation]    Remove a property from node
-#    Remove property from node    MD_SAL    openflow:2    description
-#    Node property should not exist    MD_SAL    openflow:2     description    Switch2
+#    Remove property from node    OF    00:00:00:00:00:00:00:02    description
+#    Node property should not exist    OF    00:00:00:00:00:00:00:02     description    Switch2
 Add property to nodeconnector
     [Documentation]    Add a property to nodeconnector
-    Add property to nodeconnector    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    1000
-    Nodeconnector property should exist    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    ${1000}
+    Add property to nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    1000
+    Nodeconnector property should exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
+
 Remove property from nodeconnector
     [Documentation]    Remove a property from nodeconnector
-    Remove property from nodeconnector    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth
-    Nodeconnector property should not exist    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    ${1000}
+    Remove property from nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth
+    Nodeconnector property should not exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
 
 *** Keywords ***
 Get node
     [Arguments]    ${node_id}    ${node_type}
     [Documentation]    Get a specific node
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/nodes
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
     Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
     ${result}    TO JSON    ${resp.content}
     ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
index 7227e3c235..adc6d9ce23 100644
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
@@ -8,9 +8,9 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${node1}       "openflow:1"
-${node2}       "openflow:2"
-${node3}       "openflow:3"
+${node1}       "00:00:00:00:00:00:00:01"
+${node2}       "00:00:00:00:00:00:00:02"
+${node3}       "00:00:00:00:00:00:00:03"
 ${key}             portStatistics
 ${REST_CONTEXT}    /controller/nb/v2/statistics
 
diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
index e681cd8ebb..58a4d08c0a 100644
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
@@ -8,9 +8,9 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${node1}   "openflow:1"
-${node2}   "openflow:2"
-${node3}   "openflow:3"
+${node1}   "00:00:00:00:00:00:00:01"
+${node2}   "00:00:00:00:00:00:00:02"
+${node3}   "00:00:00:00:00:00:00:03"
 ${name}           test_userlink1
 ${key}            userLinks
 ${REST_CONTEXT}    /controller/nb/v2/topology
@@ -29,7 +29,7 @@ Add a userlink
     [Documentation]    Add a userlink, list to validate the result.
     [Tags]    add
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
@@ -41,7 +41,7 @@ Remove a userlink
     [Documentation]    Remove a userlink, list to validate the result.
     [Tags]    remove
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
index 023b14f81a..5546015066 100644
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
@@ -10,7 +10,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${name}           flow1
 ${key}            flowConfig
-${node_id}        openflow:2
+${node_id}        00:00:00:00:00:00:00:02
 ${REST_CONTEXT}    /controller/nb/v2/flowprogrammer
 ${REST_CONTEXT_ST}    /controller/nb/v2/statistics
 ${FLOW}           "10.0.0.1"
@@ -19,12 +19,12 @@ ${FLOW}           "10.0.0.1"
 Add a flow
     [Documentation]    Add a flow, list to validate the result.
     [Tags]    add
-    ${node}    Create Dictionary    type    MD_SAL    id    ${node_id}
-    ${actions}    Create List    OUTPUT=openflow:2:1
+    ${node}    Create Dictionary    type    OF    id    ${node_id}
+    ${actions}    Create List    OUTPUT=1
     ${body}    Create Dictionary    name    ${name}    installInHw    true    node
     ...    ${node}    priority    1    etherType    0x800    nwDst
     ...    10.0.0.1/32    actions    ${actions}
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/node/MD_SAL/${node_id}/staticFlow/${name}    data=${body}
+    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -32,9 +32,9 @@ Add a flow
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
 Check flow in flow stats
-   [Documentation]    Show flow stats and validate result
-    [Tags]    get
-    Sleep	30
+    [Documentation]    Show flow stats and validate result
+    [Tags]   get
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
@@ -42,12 +42,12 @@ Check flow in flow stats
 Remove a flow
     [Documentation]    Remove a flow, list to validate the result.
     [Tags]    remove
-    ${node}    Create Dictionary    type    MD_SAL    id    ${node_id}
-    ${actions}    Create List    OUTPUT=openflow:2:1
+    ${node}    Create Dictionary    type    OF    id    ${node_id}
+    ${actions}    Create List    OUTPUT=1
     ${body}    Create Dictionary    name    ${name}    installInHw    true    node
     ...    ${node}    priority    1    etherType    0x800    nwDst
     ...    10.0.0.1/32    actions    ${actions}
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/MD_SAL/${node_id}/staticFlow/${name}
+    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -57,8 +57,9 @@ Remove a flow
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep	30
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200  
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Not Contain    ${resp.content}    ${FLOW}
+
diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
index 30cd4eb793..be2f4c5911 100644
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
@@ -7,13 +7,12 @@ Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Library           ../../../libraries/SwitchManager.py
 Variables         ../../../variables/Variables.py
-Library           ../../../libraries/Topologynew.py
+Library           ../../../libraries/Topology.py
 
 *** Variables ***
 ${REST_CONTEXT}    /controller/nb/v2/switchmanager
 
 *** Test Cases ***
-
 List all nodes
     [Documentation]    List all nodes and their properties in the network.
     [Tags]    list_info
@@ -27,49 +26,49 @@ List all nodes
 Check node 1 connectors 
     [Documentation]    List node connectors and verify all connectors are there
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:1
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:01
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:1:1
-    Should Contain     ${resp.content}    openflow:1:2
+    Should Contain     ${resp.content}    s1-eth1
+    Should Contain     ${resp.content}    s1-eth2
 Check node 2 connectors               
     [Documentation]    List node connectors and verify all connectors are there                      
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:2
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:02
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:2:1              
-    Should Contain     ${resp.content}    openflow:2:2  
-    Should Contain     ${resp.content}    openflow:2:3
+    Should Contain     ${resp.content}    s2-eth1             
+    Should Contain     ${resp.content}    s2-eth2  
+    Should Contain     ${resp.content}    s2-eth3
 Check node 3 connectors               
     [Documentation]    List node connectors and verify all connectors are there                      
     [Tags]    list_info
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/MD_SAL/openflow:3
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/node/OF/00:00:00:00:00:00:00:03
     Should Be Equal As Strings    ${resp.status_code}    200    Response   status code error
-    Should Contain     ${resp.content}    openflow:3:1              
-    Should Contain     ${resp.content}    openflow:3:2  
-    Should Contain     ${resp.content}    openflow:3:3
+    Should Contain     ${resp.content}    s3-eth1           
+    Should Contain     ${resp.content}    s3-eth2
+    Should Contain     ${resp.content}    s3-eth3
 Add property to node
     [Documentation]    Add a property to node
-    Add property to node    MD_SAL    openflow:2    description     Switch2
-    Node property should exist    MD_SAL    openflow:2    description    Switch2
-#    Standing bug #335 - This has been fixed!
+    Add property to node    OF    00:00:00:00:00:00:00:02    description     Switch2
+    Node property should exist    OF    00:00:00:00:00:00:00:02    description    Switch2
 #Remove property from node
 #    [Documentation]    Remove a property from node
-#    Remove property from node    MD_SAL    openflow:2    description
-#    Node property should not exist    MD_SAL    openflow:2     description    Switch2
+#    Remove property from node    OF    00:00:00:00:00:00:00:02    description
+#    Node property should not exist    OF    00:00:00:00:00:00:00:02     description    Switch2
 Add property to nodeconnector
     [Documentation]    Add a property to nodeconnector
-    Add property to nodeconnector    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    1000
-    Nodeconnector property should exist    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    ${1000}
+    Add property to nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    1000
+    Nodeconnector property should exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
+
 Remove property from nodeconnector
     [Documentation]    Remove a property from nodeconnector
-    Remove property from nodeconnector    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth
-    Nodeconnector property should not exist    MD_SAL    openflow:2    MD_SAL    openflow:2:2    bandwidth    ${1000}
+    Remove property from nodeconnector    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth
+    Nodeconnector property should not exist    OF    00:00:00:00:00:00:00:02    OF    2    bandwidth    ${1000}
 
 *** Keywords ***
 Get node
     [Arguments]    ${node_id}    ${node_type}
     [Documentation]    Get a specific node
-    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/default/nodes
+    ${resp}    Get    ${ODL_CONTROLLER_SESSION}    ${REST_CONTEXT}/${CONTAINER}/nodes
     Should Be Equal As Strings    ${resp.status_code}    200    Response status code error
     ${result}    TO JSON    ${resp.content}
     ${node}    Create Dictionary    id    ${node_id}    type    ${node_type}
diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
index 4964a47e1c..adc6d9ce23 100644
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation     Test suite for Statistics Manager 
+Documentation     Test suite for Statistics Manager
 Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
@@ -8,9 +8,9 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${node1}       "openflow:1"
-${node2}       "openflow:2"
-${node3}       "openflow:3"
+${node1}       "00:00:00:00:00:00:00:01"
+${node2}       "00:00:00:00:00:00:00:02"
+${node3}       "00:00:00:00:00:00:00:03"
 ${key}             portStatistics
 ${REST_CONTEXT}    /controller/nb/v2/statistics
 
diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
index e681cd8ebb..58a4d08c0a 100644
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
@@ -8,9 +8,9 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${node1}   "openflow:1"
-${node2}   "openflow:2"
-${node3}   "openflow:3"
+${node1}   "00:00:00:00:00:00:00:01"
+${node2}   "00:00:00:00:00:00:00:02"
+${node3}   "00:00:00:00:00:00:00:03"
 ${name}           test_userlink1
 ${key}            userLinks
 ${REST_CONTEXT}    /controller/nb/v2/topology
@@ -29,7 +29,7 @@ Add a userlink
     [Documentation]    Add a userlink, list to validate the result.
     [Tags]    add
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
@@ -41,7 +41,7 @@ Remove a userlink
     [Documentation]    Remove a userlink, list to validate the result.
     [Tags]    remove
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
index 023b14f81a..5546015066 100644
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
@@ -10,7 +10,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${name}           flow1
 ${key}            flowConfig
-${node_id}        openflow:2
+${node_id}        00:00:00:00:00:00:00:02
 ${REST_CONTEXT}    /controller/nb/v2/flowprogrammer
 ${REST_CONTEXT_ST}    /controller/nb/v2/statistics
 ${FLOW}           "10.0.0.1"
@@ -19,12 +19,12 @@ ${FLOW}           "10.0.0.1"
 Add a flow
     [Documentation]    Add a flow, list to validate the result.
     [Tags]    add
-    ${node}    Create Dictionary    type    MD_SAL    id    ${node_id}
-    ${actions}    Create List    OUTPUT=openflow:2:1
+    ${node}    Create Dictionary    type    OF    id    ${node_id}
+    ${actions}    Create List    OUTPUT=1
     ${body}    Create Dictionary    name    ${name}    installInHw    true    node
     ...    ${node}    priority    1    etherType    0x800    nwDst
     ...    10.0.0.1/32    actions    ${actions}
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/node/MD_SAL/${node_id}/staticFlow/${name}    data=${body}
+    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -32,9 +32,9 @@ Add a flow
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
 Check flow in flow stats
-   [Documentation]    Show flow stats and validate result
-    [Tags]    get
-    Sleep	30
+    [Documentation]    Show flow stats and validate result
+    [Tags]   get
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
@@ -42,12 +42,12 @@ Check flow in flow stats
 Remove a flow
     [Documentation]    Remove a flow, list to validate the result.
     [Tags]    remove
-    ${node}    Create Dictionary    type    MD_SAL    id    ${node_id}
-    ${actions}    Create List    OUTPUT=openflow:2:1
+    ${node}    Create Dictionary    type    OF    id    ${node_id}
+    ${actions}    Create List    OUTPUT=1
     ${body}    Create Dictionary    name    ${name}    installInHw    true    node
     ...    ${node}    priority    1    etherType    0x800    nwDst
     ...    10.0.0.1/32    actions    ${actions}
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/MD_SAL/${node_id}/staticFlow/${name}
+    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
@@ -57,8 +57,9 @@ Remove a flow
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep	30
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200  
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Not Contain    ${resp.content}    ${FLOW}
+
diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
index c32a740b0a..f70497ae42 100644
--- a/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
+++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
@@ -18,9 +18,9 @@ ${FLOW}           "10.0.1.4"
 Add a host
     [Documentation]    Add a host, list to validate the result.
     [Tags]    add
-    ${body}    Create Dictionary    nodeType    MD_SAL    dataLayerAddress    5e:bf:79:84:10:a6    vlan
-    ...    1    nodeId    openflow:3    nodeConnectorId    openflow:3:2    networkAddress
-    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    MD_SAL
+    ${body}    Create Dictionary    nodeType    OF    dataLayerAddress    5e:bf:79:84:10:a6    vlan
+    ...    1    nodeId    00:00:00:00:00:00:00:03    nodeConnectorId    2    networkAddress
+    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    OF
     ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/address/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/hosts/active
@@ -31,17 +31,17 @@ Add a host
 Check flow in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]   get
-    Sleep	30
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200   
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Contain X Times   ${resp.content}    ${FLOW}   3
 Remove a host
     [Documentation]    Remove a host, list to validate the result.
     [Tags]    remove
-    ${body}    Create Dictionary    nodeType    MD_SAL    dataLayerAddress    5e:bf:79:84:10:a6    vlan
-    ...    1    nodeId    openflow:3    nodeConnectorId    openflow:3:2    networkAddress
-    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    MD_SAL
+    ${body}    Create Dictionary    nodeType    OF    dataLayerAddress    5e:bf:79:84:10:a6    vlan
+    ...    1    nodeId    00:00:00:00:00:00:00:03    nodeConnectorId    2    networkAddress
+    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    OF
     ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/address/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/hosts/inactive
@@ -52,9 +52,9 @@ Remove a host
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep	30
+    Sleep    30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Not Contain    ${resp.content}    ${FLOW}
 
diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
index e25b469cbc..dd77729c5a 100644
--- a/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
+++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation     Test suite for Static Route 
+Documentation     Test suite for Static Route
 Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
@@ -12,7 +12,7 @@ Variables         ../../../variables/Variables.py
 ${name}           test_route1
 ${key}            staticRoute
 ${REST_CONTEXT}    /controller/nb/v2/staticroute
-${REST_CONTEXT_ST}   /controller/nb/v2/statistics
+${REST_CONTEXT_HT}   /controller/nb/v2/hosttracker
 
 *** Test Cases ***
 Add a static route
@@ -27,7 +27,7 @@ Add a static route
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
-    Sleep 	30
+    Sleep    30
 #     This works locally but NOT in OpenDaylight
 #Check flow in flow stats
 #    [Documentation]    Show flow stats and validate result
@@ -48,3 +48,4 @@ Remove a static route
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
+
diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
index c32a740b0a..f70497ae42 100644
--- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
+++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
@@ -18,9 +18,9 @@ ${FLOW}           "10.0.1.4"
 Add a host
     [Documentation]    Add a host, list to validate the result.
     [Tags]    add
-    ${body}    Create Dictionary    nodeType    MD_SAL    dataLayerAddress    5e:bf:79:84:10:a6    vlan
-    ...    1    nodeId    openflow:3    nodeConnectorId    openflow:3:2    networkAddress
-    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    MD_SAL
+    ${body}    Create Dictionary    nodeType    OF    dataLayerAddress    5e:bf:79:84:10:a6    vlan
+    ...    1    nodeId    00:00:00:00:00:00:00:03    nodeConnectorId    2    networkAddress
+    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    OF
     ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/address/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/hosts/active
@@ -31,17 +31,17 @@ Add a host
 Check flow in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]   get
-    Sleep	30
+    Sleep   30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200   
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Contain X Times   ${resp.content}    ${FLOW}   3
 Remove a host
     [Documentation]    Remove a host, list to validate the result.
     [Tags]    remove
-    ${body}    Create Dictionary    nodeType    MD_SAL    dataLayerAddress    5e:bf:79:84:10:a6    vlan
-    ...    1    nodeId    openflow:3    nodeConnectorId    openflow:3:2    networkAddress
-    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    MD_SAL
+    ${body}    Create Dictionary    nodeType    OF    dataLayerAddress    5e:bf:79:84:10:a6    vlan
+    ...    1    nodeId    00:00:00:00:00:00:00:03    nodeConnectorId    2    networkAddress
+    ...    10.0.1.4    staticHost    ${True}    nodeConnectorType    OF
     ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/address/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/hosts/inactive
@@ -52,9 +52,9 @@ Remove a host
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep	30
+    Sleep    30
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
-    Should Be Equal As Strings    ${resp.status_code}    200
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
     Should Not Contain    ${resp.content}    ${FLOW}
 
diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
index 5896d120a2..dd77729c5a 100644
--- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
+++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
@@ -12,7 +12,7 @@ Variables         ../../../variables/Variables.py
 ${name}           test_route1
 ${key}            staticRoute
 ${REST_CONTEXT}    /controller/nb/v2/staticroute
-${REST_CONTEXT_ST}   /controller/nb/v2/statistics
+${REST_CONTEXT_HT}   /controller/nb/v2/hosttracker
 
 *** Test Cases ***
 Add a static route
@@ -27,7 +27,7 @@ Add a static route
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
-    Sleep 	30
+    Sleep    30
 #     This works locally but NOT in OpenDaylight
 #Check flow in flow stats
 #    [Documentation]    Show flow stats and validate result
@@ -48,3 +48,4 @@ Remove a static route
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
+
-- 
2.36.6