aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-04-12 11:08:47 +0200
committerselias <samelias@cisco.com>2017-04-12 12:29:14 +0200
commit0ad79235c1fc9cd6c8d7a5e894c4d69490afda3c (patch)
tree362ff05c96a607e9ea99887cebf6d32dc40c001c
parent0c4d0080a1488e2aeaa2d0abe9bbcb37c5bfe7c3 (diff)
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>
-rw-r--r--resources/templates/honeycomb/config_proxyarp_ranges.url2
-rw-r--r--resources/templates/honeycomb/config_routing_table.url2
-rw-r--r--resources/templates/honeycomb/oper_routing_table.url2
-rw-r--r--tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot2
-rw-r--r--tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot2
5 files changed, 5 insertions, 5 deletions
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}