DHCPv6 Proxy test update

Change-Id: I8206a652bfa31cda0f7120741a0479a10ad4b1a1
Signed-off-by: Patrik Hrnciar <phrnciar@cisco.com>

diff --git a/resources/traffic_scripts/dhcp/send_dhcp_v6_messages.py b/resources/traffic_scripts/dhcp/send_dhcp_v6_messages.py
index d570a8c..21357ad 100755 (executable)
--- a/resources/traffic_scripts/dhcp/send_dhcp_v6_messages.py
+++ b/resources/traffic_scripts/dhcp/send_dhcp_v6_messages.py
@@ -163,9 +163,9 @@ def dhcpv6_advertise(rx_if, tx_if, link_local_ip, proxy_ip,
         raise RuntimeError("Checksum error!")
     print "Checksum: OK."
 
         raise RuntimeError("Checksum error!")
     print "Checksum: OK."
 

-    if ether['IPv6']['UDP']['Raw'].load != interface_id:
-        raise RuntimeError("Interface ID error!")
-    print "Interface ID: OK."
+    if ether['IPv6']['UDP']['DHCPv6 Advertise Message'].msgtype != 'ADVERTISE':
+        raise RuntimeError("Message type error!")
+    print "Message type: OK."

 
 
 def dhcpv6_request(tx_if, rx_if, dhcp_multicast_ip, link_local_ip, proxy_ip,
 
 
 def dhcpv6_request(tx_if, rx_if, dhcp_multicast_ip, link_local_ip, proxy_ip,


@@ -282,9 +282,9 @@ def dhcpv6_reply(rx_if, tx_if, link_local_ip, proxy_ip, server_ip, server_mac,
         raise RuntimeError("Checksum error!")
     print "Checksum: OK."
 
         raise RuntimeError("Checksum error!")
     print "Checksum: OK."
 

-    if ether['IPv6']['UDP']['Raw'].load != interface_id:
-        raise RuntimeError("Interface ID error!")
-    print "Interface ID: OK."
+    if ether['IPv6']['UDP']['DHCPv6 Reply Message'].msgtype != 'REPLY':
+        raise RuntimeError("Message type error!")
+    print "Message type: OK."

 
 
 def main():
 
 
 def main():

diff --git a/tests/func/dhcp/dhcp_v6_proxy.robot b/tests/func/dhcp/dhcp_v6_proxy.robot
index 6df6382..8f38bb2 100644 (file)
--- a/tests/func/dhcp/dhcp_v6_proxy.robot
+++ b/tests/func/dhcp/dhcp_v6_proxy.robot
@@ -49,6 +49,7 @@
 | | ... | server through DHCP proxy.
 | | ... | [Ref] RFC 3315
 | | ...
 | | ... | server through DHCP proxy.
 | | ... | [Ref] RFC 3315
 | | ...

+| | [Tags] | EXPECTED_FAILING

 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Interfaces in 2-node path are up
 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Interfaces in 2-node path are up