From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Fri, 8 Jan 2016 02:19:31 +0000 (-0800)
Subject: fixing failing ovsdb cluster test suite
X-Git-Tag: release/beryllium-sr1~235
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=c8f4b9659d33c5f71d386a6c23852fa02ec92b01

fixing failing ovsdb cluster test suite

-  successful PUT requests now return 201, instead of 200
-  the UUID was hardcoded, and it will never be the same so
   using regexp to replace the UUID with ${EMPTY}

Change-Id: I509e5f8d6ff6d3ad5da1a3fc6381d7c3c79cd385
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot
index 1df0c263e3..ff7ecae896 100644
--- a/csit/libraries/ClusterOvsdb.robot
+++ b/csit/libraries/ClusterOvsdb.robot
@@ -33,7 +33,9 @@ Get Cluster Entity Owner For Ovsdb
     ${data}=    Get Data From URI    controller@{controller_index_list}[0]    /restconf/operational/entity-owners:entity-owners
     Log    ${data}
     ${data}=    Replace String    ${data}    /network-topology:network-topology/network-topology:topology[network-topology:topology-id='    ${EMPTY}
-    ${data}=    Replace String    ${data}    /network-topology:node[network-topology:node-id='ovsdb://uuid/a96ec4e2-c457-4a2c-963c-1e6300210032    ${EMPTY}
+    # the UUID will not always be the same so need to use regexp to remove this string
+    ${data}=    Replace String Using Regexp    ${data}    \/network-topology:node\\[network-topology:node-id='ovsdb://uuid/........-....-....-....-............    ${EMPTY}
+    Log    ${data}
     ${clear_data}=    Replace String    ${data}    ']    ${EMPTY}
     Log    ${clear_data}
     ${json}=    To Json    ${clear_data}
diff --git a/csit/libraries/Utils.robot b/csit/libraries/Utils.robot
index 4707b6add9..87d8d7aa2d 100644
--- a/csit/libraries/Utils.robot
+++ b/csit/libraries/Utils.robot
@@ -19,7 +19,7 @@ Start Suite
     ...    is run.
     Log    Start the test on the base edition
     Clean Mininet System
-    ${mininet_conn_id}=    Open Connection    ${system}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=${timeout}
+    ${mininet_conn_id}=    Open Connection    ${system}    prompt=${prompt}    timeout=${timeout}
     Set Suite Variable    ${mininet_conn_id}
     Flexible Mininet Login    user=${user}    password=${password}
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644