From: selias <samelias@cisco.com>
Date: Wed, 12 Apr 2017 09:08:47 +0000 (+0200)
Subject: HC Test: update URL paths with ODL mountpoint
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=0ad79235c1fc9cd6c8d7a5e894c4d69490afda3c

HC Test: update URL paths with ODL mountpoint

other minor fixes:
	- update teardown keyword in proxyARP suite
	- increase timeout for SLAAC traffic test

Change-Id: Ia16d096c54ceac501a24d5d910dd18e33d900d2a
Signed-off-by: selias <samelias@cisco.com>
---

diff --git a/resources/templates/honeycomb/config_proxyarp_ranges.url b/resources/templates/honeycomb/config_proxyarp_ranges.url
index 9de2db6ca1..2ac0b6528c 100644
--- a/resources/templates/honeycomb/config_proxyarp_ranges.url
+++ b/resources/templates/honeycomb/config_proxyarp_ranges.url
@@ -1 +1 @@
-/restconf/config/proxy-arp:proxy-ranges
\ No newline at end of file
+/restconf/config{odl_url_part}/proxy-arp:proxy-ranges
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_routing_table.url b/resources/templates/honeycomb/config_routing_table.url
index 9c15c49912..f3b846f8a3 100644
--- a/resources/templates/honeycomb/config_routing_table.url
+++ b/resources/templates/honeycomb/config_routing_table.url
@@ -1 +1 @@
-/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols
\ No newline at end of file
+/restconf/config{odl_url_part}/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/routing-protocols
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_routing_table.url b/resources/templates/honeycomb/oper_routing_table.url
index 0b34793d70..8096dcb69e 100644
--- a/resources/templates/honeycomb/oper_routing_table.url
+++ b/resources/templates/honeycomb/oper_routing_table.url
@@ -1 +1 @@
-/restconf/operational/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols
\ No newline at end of file
+/restconf/operational{odl_url_part}/hc2vpp-ietf-routing:routing-state/routing-instance/vpp-routing-instance/routing-protocols
\ No newline at end of file
diff --git a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot
index 2847515c57..9263ebbc2a 100644
--- a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot
@@ -32,7 +32,7 @@
 | Library | resources.libraries.python.Trace
 | Suite Teardown
 | ... | Run Keyword If Any Tests Failed
-| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| ... | Restart Honeycomb And VPP | ${node}
 | Force Tags | honeycomb_sanity | honeycomb_odl
 | Documentation | *Honeycomb proxyARP management test suite.*
 
diff --git a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
index 23370f0043..8d85eb2a45 100644
--- a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
@@ -116,4 +116,4 @@
 | | ... | ${slaac_data}
 | | :FOR | ${n} | IN RANGE | ${2}
 | | | Then Receive And Check Router Advertisement Packet
-| | | ... | ${tg_node} | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${5}
+| | | ... | ${tg_node} | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${20}