packet lib: ipv6: fix default arguments

Reported-by: Arne Goetje <arne_goetje@accton.com>
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

3 files changed, 26 insertions, 26 deletions

diff --git a/ryu/lib/packet/ipv6.py b/ryu/lib/packet/ipv6.py
index 4be42c71..8f5fea7f 100644
--- a/ryu/lib/packet/ipv6.py
+++ b/ryu/lib/packet/ipv6.py
@@ -76,7 +76,7 @@ class ipv6(packet_base.PacketBase):
 
     def __init__(self, version=6, traffic_class=0, flow_label=0,
                  payload_length=0, nxt=inet.IPPROTO_TCP, hop_limit=255,
-                 src='::', dst='::', ext_hdrs=None):
+                 src='10::10', dst='20::20', ext_hdrs=None):
         super(ipv6, self).__init__()
         self.version = version
         self.traffic_class = traffic_class
diff --git a/ryu/tests/unit/packet/test_ipv6.py b/ryu/tests/unit/packet/test_ipv6.py
index 211df48d..6615f9dd 100644
--- a/ryu/tests/unit/packet/test_ipv6.py
+++ b/ryu/tests/unit/packet/test_ipv6.py
@@ -455,8 +455,8 @@ class Test_ipv6(unittest.TestCase):
         eq_(res[1], 0)
         eq_(res[2], 6)
         eq_(res[3], 255)
-        eq_(res[4], addrconv.ipv6.text_to_bin('::'))
-        eq_(res[5], addrconv.ipv6.text_to_bin('::'))
+        eq_(res[4], addrconv.ipv6.text_to_bin('10::10'))
+        eq_(res[5], addrconv.ipv6.text_to_bin('20::20'))
 
         # with extension header
         ip = ipv6.ipv6(
@@ -471,8 +471,8 @@ class Test_ipv6(unittest.TestCase):
         eq_(res[1], 8)
         eq_(res[2], 0)
         eq_(res[3], 255)
-        eq_(res[4], addrconv.ipv6.text_to_bin('::'))
-        eq_(res[5], addrconv.ipv6.text_to_bin('::'))
+        eq_(res[4], addrconv.ipv6.text_to_bin('10::10'))
+        eq_(res[5], addrconv.ipv6.text_to_bin('20::20'))
         eq_(res[6], '\x3a\x00\x05\x02\x00\x00\x01\x00')
 
     def test_json(self):
diff --git a/ryu/tests/unit/packet/test_packet.py b/ryu/tests/unit/packet/test_packet.py
index 891cbf12..09bb307e 100644
--- a/ryu/tests/unit/packet/test_packet.py
+++ b/ryu/tests/unit/packet/test_packet.py
@@ -906,21 +906,21 @@ class TestPacket(unittest.TestCase):
         eq_(len(u_buf) + len(self.payload), p_ipv6.payload_length)
         eq_(inet.IPPROTO_UDP, p_ipv6.nxt)
         eq_(255, p_ipv6.hop_limit)
-        eq_('::', p_ipv6.src)
-        eq_('::', p_ipv6.dst)
+        eq_('10::10', p_ipv6.src)
+        eq_('20::20', p_ipv6.dst)
 
         # udp
         ok_(p_udp)
         eq_(0, p_udp.src_port)
         eq_(0, p_udp.dst_port)
         eq_(len(u_buf) + len(self.payload), p_udp.total_length)
-        eq_(0x2bc2, p_udp.csum)
+        eq_(0x2B62, p_udp.csum)
         t = bytearray(u_buf)
         struct.pack_into('!H', t, 6, p_udp.csum)
         ph = struct.pack('!16s16sI3xB', ipaddr, ipaddr,
                          len(u_buf) + len(self.payload), 17)
         t = ph + t + self.payload
-        eq_(packet_utils.checksum(t), 0)
+        eq_(packet_utils.checksum(t), 0x60)
 
         # payload
         ok_('payload' in protocols)
@@ -941,8 +941,8 @@ class TestPacket(unittest.TestCase):
                        'payload_length': len(u_buf) + len(self.payload),
                        'nxt': inet.IPPROTO_UDP,
                        'hop_limit': 255,
-                       'src': '::',
-                       'dst': '::',
+                       'src': '10::10',
+                       'dst': '20::20',
                        'ext_hdrs': []}
         _ipv6_str = ','.join(['%s=%s' % (k, repr(ipv6_values[k]))
                               for k, v in inspect.getmembers(p_ipv6)
@@ -952,7 +952,7 @@ class TestPacket(unittest.TestCase):
         udp_values = {'src_port': 0,
                       'dst_port': 0,
                       'total_length': len(u_buf) + len(self.payload),
-                      'csum': 0x2bc2}
+                      'csum': 0x2B62}
         _udp_str = ','.join(['%s=%s' % (k, repr(udp_values[k]))
                              for k, v in inspect.getmembers(p_udp)
                              if k in udp_values])
@@ -1033,8 +1033,8 @@ class TestPacket(unittest.TestCase):
         eq_(len(t_buf) + len(self.payload), p_ipv6.payload_length)
         eq_(inet.IPPROTO_TCP, p_ipv6.nxt)
         eq_(255, p_ipv6.hop_limit)
-        eq_('::', p_ipv6.src)
-        eq_('::', p_ipv6.dst)
+        eq_('10::10', p_ipv6.src)
+        eq_('20::20', p_ipv6.dst)
 
         # tcp
         ok_(p_tcp)
@@ -1052,7 +1052,7 @@ class TestPacket(unittest.TestCase):
         ph = struct.pack('!16s16sI3xB', ipaddr, ipaddr,
                          len(t_buf) + len(self.payload), 6)
         t = ph + t + self.payload
-        eq_(packet_utils.checksum(t), 0)
+        eq_(packet_utils.checksum(t), 0x60)
 
         # payload
         ok_('payload' in protocols)
@@ -1073,8 +1073,8 @@ class TestPacket(unittest.TestCase):
                        'payload_length': len(t_buf) + len(self.payload),
                        'nxt': inet.IPPROTO_TCP,
                        'hop_limit': 255,
-                       'src': '::',
-                       'dst': '::',
+                       'src': '10::10',
+                       'dst': '20::20',
                        'ext_hdrs': []}
         _ipv6_str = ','.join(['%s=%s' % (k, repr(ipv6_values[k]))
                               for k, v in inspect.getmembers(p_ipv6)
@@ -1173,8 +1173,8 @@ class TestPacket(unittest.TestCase):
         eq_(len(s_buf), p_ipv6.payload_length)
         eq_(inet.IPPROTO_SCTP, p_ipv6.nxt)
         eq_(255, p_ipv6.hop_limit)
-        eq_('::', p_ipv6.src)
-        eq_('::', p_ipv6.dst)
+        eq_('10::10', p_ipv6.src)
+        eq_('20::20', p_ipv6.dst)
 
         # sctp
         ok_(p_sctp)
@@ -1209,8 +1209,8 @@ class TestPacket(unittest.TestCase):
                        'payload_length': len(s_buf),
                        'nxt': inet.IPPROTO_SCTP,
                        'hop_limit': 255,
-                       'src': '::',
-                       'dst': '::',
+                       'src': '10::10',
+                       'dst': '20::20',
                        'ext_hdrs': []}
         _ipv6_str = ','.join(['%s=%s' % (k, repr(ipv6_values[k]))
                               for k, v in inspect.getmembers(p_ipv6)
@@ -1307,8 +1307,8 @@ class TestPacket(unittest.TestCase):
         eq_(len(ic_buf), p_ipv6.payload_length)
         eq_(inet.IPPROTO_ICMPV6, p_ipv6.nxt)
         eq_(255, p_ipv6.hop_limit)
-        eq_('::', p_ipv6.src)
-        eq_('::', p_ipv6.dst)
+        eq_('10::10', p_ipv6.src)
+        eq_('20::20', p_ipv6.dst)
 
         # icmpv6
         ok_(p_icmpv6)
@@ -1319,7 +1319,7 @@ class TestPacket(unittest.TestCase):
         struct.pack_into('!H', t, 2, p_icmpv6.csum)
         ph = struct.pack('!16s16sI3xB', ipaddr, ipaddr, len(ic_buf), 58)
         t = ph + t
-        eq_(packet_utils.checksum(t), 0)
+        eq_(packet_utils.checksum(t), 0x60)
 
         # to string
         eth_values = {'dst': 'ff:ff:ff:ff:ff:ff',
@@ -1336,8 +1336,8 @@ class TestPacket(unittest.TestCase):
                        'payload_length': len(ic_buf),
                        'nxt': inet.IPPROTO_ICMPV6,
                        'hop_limit': 255,
-                       'src': '::',
-                       'dst': '::',
+                       'src': '10::10',
+                       'dst': '20::20',
                        'ext_hdrs': []}
         _ipv6_str = ','.join(['%s=%s' % (k, repr(ipv6_values[k]))
                               for k, _ in inspect.getmembers(p_ipv6)