gmane.network.ryu.devel

Re: [PATCH 1/2] lib/packet/vrrp: fix is_valid()

Isaku Yamahata — 2013-05-21T10:26:20

Oops. The both patches looks good.

On Tue, May 21, 2013 at 01:44:09PM +0900, YAMADA Hideki wrote:

Re: [PATCH] test_parser_v10: remove tests for str

Isaku Yamahata — 2013-05-21T06:23:52

Although I'm not sure how much make sense to keep the test,
it will make test pass to make string parser a bit smarter.

From
        str_ = str_.rsplit()
to something like
[re.sub('\).*', '', r) for r in re.split('[(,= ]', str(res))]

thanks

On Tue, May 21, 2013 at 01:13:58PM +0900, YAMADA Hideki wrote:

[PATCH 2/2] tests/unit/packet/test_vrrp: add tests foris_valid()

YAMADA Hideki — 2013-05-21T04:44:10

Signed-off-by: YAMADA Hideki <yamada.hideki-lJ4LtgMnyE9L9jVzuh4AOg< at >public.gmane.org>
---
 ryu/tests/unit/packet/test_vrrp.py |   92 +++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 1 deletions(-)

diff --git a/ryu/tests/unit/packet/test_vrrp.py b/ryu/tests/unit/packet/test_vrrp.py
index 32dbdb4..282c9fa 100644
--- a/ryu/tests/unit/packet/test_vrrp.py
+++ b/ryu/tests/unit/packet/test_vrrp.py
< at >< at > -21,7 +21,7 < at >< at > import logging
 import struct
 import netaddr
 
-from nose.tools import eq_
+from nose.tools import eq_, ok_
 from nose.tools import raises
 
 from ryu.ofproto import inet
< at >< at > -137,6 +137,51 < at >< at > class Test_vrrpv2(unittest.TestCase):
         p1.serialize()
         eq_(p0.data, p1.data)
 
+    def _test_is_valid(self, type_=None, vrid=None, priority=None,
+                       max_adver_int=None):
+        if type_ is None:
+            type_ = self.type_
+        if vrid is None:
+            vrid = self.vrid
+        if priority is None:
+            priority = self.priority
+        if max_adver_int is None:
+            max_adver_int = self.max_adver_int
+
+        vrrp_ = vrrp.vrrpv2.create(type_, vrid, priority, max_adver_int,
+                                   [self.ip_address])
+        return vrrp_.is_valid()
+
+    def test_is_valid_ok(self):
+        ok_(self._test_is_valid())
+
+    def test_is_valid_ng_type(self):
+        ok_(not self._test_is_valid(type_=15))
+
+    def test_is_valid_ng_vrid_min(self):
+        vrid = vrrp.VRRP_VRID_MIN - 1
+        ok_(not self._test_is_valid(vrid=vrid))
+
+    def test_is_valid_ng_vrid_max(self):
+        vrid = vrrp.VRRP_VRID_MAX + 1
+        ok_(not self._test_is_valid(vrid=vrid))
+
+    def test_is_valid_ng_priority_min(self):
+        priority = vrrp.VRRP_PRIORITY_MIN - 1
+        ok_(not self._test_is_valid(priority=priority))
+
+    def test_is_valid_ng_priority_max(self):
+        priority = vrrp.VRRP_PRIORITY_MAX + 1
+        ok_(not self._test_is_valid(priority=priority))
+
+    def test_is_valid_ng_adver_min(self):
+        max_adver_int = vrrp.VRRP_V2_MAX_ADVER_INT_MIN - 1
+        ok_(not self._test_is_valid(max_adver_int=max_adver_int))
+
+    def test_is_valid_ng_adver_max(self):
+        max_adver_int = vrrp.VRRP_V2_MAX_ADVER_INT_MAX + 1
+        ok_(not self._test_is_valid(max_adver_int=max_adver_int))
+
 
 class Test_vrrpv3_ipv4(unittest.TestCase):
     """ Test case for vrrp v3 IPv4
< at >< at > -233,6 +278,51 < at >< at > class Test_vrrpv3_ipv4(unittest.TestCase):
         p1.serialize()
         eq_(p0.data, p1.data)
 
+    def _test_is_valid(self, type_=None, vrid=None, priority=None,
+                       max_adver_int=None):
+        if type_ is None:
+            type_ = self.type_
+        if vrid is None:
+            vrid = self.vrid
+        if priority is None:
+            priority = self.priority
+        if max_adver_int is None:
+            max_adver_int = self.max_adver_int
+
+        vrrp_ = vrrp.vrrpv3.create(type_, vrid, priority, max_adver_int,
+                                   [self.ip_address])
+        return vrrp_.is_valid()
+
+    def test_is_valid_ok(self):
+        ok_(self._test_is_valid())
+
+    def test_is_valid_ng_type(self):
+        ok_(not self._test_is_valid(type_=15))
+
+    def test_is_valid_ng_vrid_min(self):
+        vrid = vrrp.VRRP_VRID_MIN - 1
+        ok_(not self._test_is_valid(vrid=vrid))
+
+    def test_is_valid_ng_vrid_max(self):
+        vrid = vrrp.VRRP_VRID_MAX + 1
+        ok_(not self._test_is_valid(vrid=vrid))
+
+    def test_is_valid_ng_priority_min(self):
+        priority = vrrp.VRRP_PRIORITY_MIN - 1
+        ok_(not self._test_is_valid(priority=priority))
+
+    def test_is_valid_ng_priority_max(self):
+        priority = vrrp.VRRP_PRIORITY_MAX + 1
+        ok_(not self._test_is_valid(priority=priority))
+
+    def test_is_valid_ng_adver_min(self):
+        max_adver_int = vrrp.VRRP_V3_MAX_ADVER_INT_MIN - 1
+        ok_(not self._test_is_valid(max_adver_int=max_adver_int))
+
+    def test_is_valid_ng_adver_max(self):
+        max_adver_int = vrrp.VRRP_V3_MAX_ADVER_INT_MAX + 1
+        ok_(not self._test_is_valid(max_adver_int=max_adver_int))
+
 
 class Test_vrrpv3_ipv6(unittest.TestCase):
     """ Test case for vrrp v3 IPv6

[PATCH 1/2] lib/packet/vrrp: fix is_valid()

YAMADA Hideki — 2013-05-21T04:44:09

Signed-off-by: YAMADA Hideki <yamada.hideki-lJ4LtgMnyE9L9jVzuh4AOg< at >public.gmane.org>
---
 ryu/lib/packet/vrrp.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ryu/lib/packet/vrrp.py b/ryu/lib/packet/vrrp.py
index 7c50fed..8b6140a 100644
--- a/ryu/lib/packet/vrrp.py
+++ b/ryu/lib/packet/vrrp.py
< at >< at > -395,7 +395,7 < at >< at > class vrrp(packet_base.PacketBase):
 
     def is_valid(self):
         cls = self._VRRP_VERSIONS.get(self.version, None)
-        if None:
+        if cls is None:
             return False
         return cls.is_valid(self)
 
< at >< at > -499,8 +499,8 < at >< at > class vrrpv2(vrrp):
         return (self.version == VRRP_VERSION_V2 and
                 self.type == VRRP_TYPE_ADVERTISEMENT and
                 VRRP_VRID_MIN <= self.vrid and self.vrid <= VRRP_VRID_MAX and
-                VRRP_PRIORITY_MIN <= self.vrid and
-                self.vrid <= VRRP_PRIORITY_MAX and
+                VRRP_PRIORITY_MIN <= self.priority and
+                self.priority <= VRRP_PRIORITY_MAX and
                 self.auth_type == VRRP_AUTH_NO_AUTH and
                 VRRP_V2_MAX_ADVER_INT_MIN <= self.max_adver_int and
                 self.max_adver_int <= VRRP_V2_MAX_ADVER_INT_MAX and
< at >< at > -616,8 +616,8 < at >< at > class vrrpv3(vrrp):
         return (self.version == VRRP_VERSION_V3 and
                 self.type == VRRP_TYPE_ADVERTISEMENT and
                 VRRP_VRID_MIN <= self.vrid and self.vrid <= VRRP_VRID_MAX and
-                VRRP_PRIORITY_MIN <= self.vrid and
-                self.vrid <= VRRP_PRIORITY_MAX and
+                VRRP_PRIORITY_MIN <= self.priority and
+                self.priority <= VRRP_PRIORITY_MAX and
                 VRRP_V3_MAX_ADVER_INT_MIN <= self.max_adver_int and
                 self.max_adver_int <= VRRP_V3_MAX_ADVER_INT_MAX and
                 self.count_ip == len(self.ip_addresses))

[PATCH] test_parser_v10: remove tests for str

YAMADA Hideki — 2013-05-21T04:13:58

Following errors occur at current master
(commit 21692141dc7e8be2d44338ce4eff5af584e4ff8f)

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPFlowRemoved)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 4080, in test_parser
    eq_(str(cookie['val']), check['cookie'])
KeyError: 'cookie'

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3782, in test_parser
    ok_(self._test_parser())
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser
    eq_(str(buffer_id['val']), check['buffer_id'])
KeyError: 'buffer_id'

======================================================================
ERROR: test_parser_padding (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3785, in test_parser_padding
    ok_(self._test_parser(True))
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser
    eq_(str(buffer_id['val']), check['buffer_id'])
KeyError: 'buffer_id'

======================================================================
ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropMinRate)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2615, in test_str
    eq_(check['rate'], str(self.rate['val']))
KeyError: 'rate'

======================================================================
ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropNone)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2564, in test_str
    eq_(check['property'], str(self.property['val']))
KeyError: 'property'

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPSwitchFeatures)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3580, in test_parser
    eq_(check['ports'].find('OFPPhyPort'), 0)
KeyError: 'ports'

Signed-off-by: YAMADA Hideki <yamada.hideki-lJ4LtgMnyE9L9jVzuh4AOg< at >public.gmane.org>
---
 ryu/tests/unit/ofproto/test_parser_v10.py |  370 -----------------------------
 1 files changed, 0 insertions(+), 370 deletions(-)

diff --git a/ryu/tests/unit/ofproto/test_parser_v10.py b/ryu/tests/unit/ofproto/test_parser_v10.py
index e135a62..4b1e20c 100644
--- a/ryu/tests/unit/ofproto/test_parser_v10.py
+++ b/ryu/tests/unit/ofproto/test_parser_v10.py
< at >< at > -2549,21 +2549,6 < at >< at > class TestOFPQueuePropNone(unittest.TestCase):
 
         ok_(self.c.parser(buf, 0))
 
-    def test_str(self):
-        list_ = ('property', 'len')
-        check = {}
-        str_ = str(self.c)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(check['property'], str(self.property['val']))
-        eq_(check['len'], str(self.len['val']))
-
 
 class TestOFPQueuePropMinRate(unittest.TestCase):
     """ Test case for ofprotp_v1_0_parser.OFPQueuePropMinRate
< at >< at > -2600,20 +2585,6 < at >< at > class TestOFPQueuePropMinRate(unittest.TestCase):
         res = self.c.parser(self.buf, 0)
         eq_(self.rate['val'], res.rate)
 
-    def test_str(self):
-        list_ = ('rate',)
-        check = {}
-        str_ = str(self.c)
-        str_ = str_.rsplit()
-        i = 0
-
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(check['rate'], str(self.rate['val']))
-
 
 class TestOFPPacketQueue(unittest.TestCase):
     """ Test case for ofprotp_v1_0_parser.OFPPacketQueue
< at >< at > -2714,24 +2685,6 < at >< at > class TestOFPHello(unittest.TestCase):
         eq_(xid, res.xid)
         eq_(buffer(buf), res.buf)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        # comparison fails in some environment
-        #   such as hex() returns string with suffix 'L'
-        eq_(hex(ofproto_v1_0.OFP_VERSION).find(check['version:']), 0)
-        eq_(hex(ofproto_v1_0.OFPT_HELLO).find(check['msg_type']), 0)
-        eq_(hex(xid).find(check['xid']), 0)
-
     def test_serialize(self):
 
         class Datapath(object):
< at >< at > -2791,22 +2744,6 < at >< at > class TestOFPErrorMsg(unittest.TestCase):
         eq_(code['val'], res.code)
         eq_(data, res.data)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         class Datapath(object):
             ofproto = ofproto_v1_0
< at >< at > -2882,24 +2819,6 < at >< at > class TestOFPEchoRequest(unittest.TestCase):
         eq_(xid['val'], res.xid)
         eq_(data, res.data)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        # comparison fails in some environment
-        #   such as hex() returns string with suffix 'L'
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         class Datapath(object):
             ofproto = ofproto_v1_0
< at >< at > -2968,24 +2887,6 < at >< at > class TestOFPEchoReply(unittest.TestCase):
         eq_(xid['val'], res.xid)
         eq_(data, res.data)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        # comparison fails in some environment
-        #   such as hex() returns string with suffix 'L'
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         class Datapath(object):
             ofproto = ofproto_v1_0
< at >< at > -3057,24 +2958,6 < at >< at > class TestOFPVendor(unittest.TestCase):
         eq_(vendor['val'], res.vendor)
         eq_(data, res.data)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        # comparison fails in some environment
-        #   such as hex() returns string with suffix 'L'
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         class Datapath(object):
             ofproto = ofproto_v1_0
< at >< at > -3559,26 +3442,6 < at >< at > class TestOFPSwitchFeatures(unittest.TestCase):
         eq_(supported['val'], port.supported)
         eq_(peer['val'], port.peer)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid', 'ports')
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                if str_[i + 1].startswith('{'):  # "{1: OFPPhyPort..."
-                    check[str_[i]] = str_[i + 2]
-                else:
-                    check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-        eq_(check['ports'].find('OFPPhyPort'), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -3667,22 +3530,6 < at >< at > class TestOFPPortStatus(unittest.TestCase):
         eq_(supported['val'], desc.supported)
         eq_(peer['val'], desc.peer)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -3755,27 +3602,6 < at >< at > class TestOFPPacketIn(unittest.TestCase):
         eq_(reason['val'], res.reason)
         eq_(data[0:16], res.data)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',
-                 'buffer_id', 'total_len', 'in_port', 'reason',)
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-        eq_(str(buffer_id['val']), check['buffer_id'])
-        eq_(str(total_len['val']), check['total_len'])
-        eq_(str(in_port['val']), check['in_port'])
-        eq_(str(reason['val']), check['reason'])
-
         return True
 
     def test_parser(self):
< at >< at > -3841,22 +3667,6 < at >< at > class TestOFPGetConfigReply(unittest.TestCase):
         eq_(flags['val'], res.flags)
         eq_(miss_send_len['val'], res.miss_send_len)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -3905,22 +3715,6 < at >< at > class TestOFPBarrierReply(unittest.TestCase):
         eq_(msg_len['val'], res.msg_len)
         eq_(xid['val'], res.xid)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4058,34 +3852,6 < at >< at > class TestOFPFlowRemoved(unittest.TestCase):
         eq_(tp_src['val'], match.tp_src)
         eq_(tp_dst['val'], match.tp_dst)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',
-                 'match', 'cookie', 'priority', 'reason',
-                 'duration_sec', 'duration_nsec',
-                 'idle_timeout', 'packet_count', 'byte_count')
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-        eq_(str(cookie['val']), check['cookie'])
-        eq_(str(priority['val']), check['priority'])
-        eq_(str(reason['val']), check['reason'])
-        eq_(str(duration_sec['val']), check['duration_sec'])
-        eq_(str(duration_nsec['val']), check['duration_nsec'])
-        eq_(str(idle_timeout['val']), check['idle_timeout'])
-        eq_(str(packet_count['val']), check['packet_count'])
-        eq_(str(byte_count['val']), check['byte_count'])
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4161,23 +3927,6 < at >< at > class TestOFPQueueGetConfigReply(unittest.TestCase):
         eq_(queue_id['val'], queue.queue_id)
         eq_(len_['val'], queue.len)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4261,23 +4010,6 < at >< at > class TestOFPDescStatsReply(unittest.TestCase):
         eq_(serial_num, body.serial_num)
         eq_(dp_desc, body.dp_desc)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4428,23 +4160,6 < at >< at > class TestOFPFlowStatsReply(unittest.TestCase):
         eq_(port['val'], action.port)
         eq_(max_len['val'], action.max_len)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4525,23 +4240,6 < at >< at > class TestOFPAggregateStatsReply(unittest.TestCase):
         eq_(byte_count['val'], body.byte_count)
         eq_(flow_count['val'], body.flow_count)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4635,23 +4333,6 < at >< at > class TestOFPTableStatsReply(unittest.TestCase):
         eq_(lookup_count['val'], body.lookup_count)
         eq_(matched_count['val'], body.matched_count)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4775,23 +4456,6 < at >< at > class TestOFPPortStatsReply(unittest.TestCase):
         eq_(rx_crc_err['val'], body.rx_crc_err)
         eq_(collisions['val'], body.collisions)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4879,23 +4543,6 < at >< at > class TestOFPQueueStatsReply(unittest.TestCase):
         eq_(tx_packets['val'], body.tx_packets)
         eq_(tx_errors['val'], body.tx_errors)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass
< at >< at > -4964,23 +4611,6 < at >< at > class TestOFPVendorStatsReply(unittest.TestCase):
         body = res.body[0]
         eq_(specific_data, body)
 
-        # test __str__()
-        list_ = ('version:', 'msg_type', 'xid',)
-
-        check = {}
-        str_ = str(res)
-        str_ = str_.rsplit()
-
-        i = 0
-        for s in str_:
-            if s in list_:
-                check[str_[i]] = str_[i + 1]
-            i += 1
-
-        eq_(hex(version['val']).find(check['version:']), 0)
-        eq_(hex(msg_type['val']).find(check['msg_type']), 0)
-        eq_(hex(xid['val']).find(check['xid']), 0)
-
     def test_serialize(self):
         # Not used.
         pass

Re: question about ryu

Isaku Yamahata — 2013-05-20T07:28:21

Simple isolation doesn't support live-migration.
In case of Simple vlan case, it up to OVS mac learning and
guest VM seinding GARP.
In case of GRE tunneling case, ryu/app/gre_tunnel.GRETunnel._vm_port_add.
grep it with "live-migration"



By detecting OVS port with same quantum port uuid and mac address which
are stored in ovsdb as external-id.
When live-migration, there are two ovs ports with same quantum port uuid
and mac address.

thanks,

Re: question about ryu

hsin han Liu — 2013-05-20T07:10:57

thanks a lot for the information!

Also,can i ask which part of the code is supporting live migration as the
document says?

https://github.com/osrg/ryu/wiki/Details-of-Ryu-in-cooperation-with-OpenStack-Grizzly

how does ryu know vm is about to migrate?


Thanks,

Allen



2013/5/20 Isaku Yamahata <yamahata-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org>

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d_______________________________________________
Ryu-devel mailing list
Ryu-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Re: question about ryu

Isaku Yamahata — 2013-05-20T02:10:53

For internal, please refer to
https://github.com/osrg/ryu/wiki/Details-of-Ryu-in-cooperation-with-OpenStack-Grizzly

They are designed to used with openstack. The easy way is use devstack
or pre-build VM image
https://github.com/osrg/ryu/wiki/configuration_openstack_grizzly_with_ryu
https://github.com/osrg/ryu/wiki/RYU-OpenStack-Grizzly-environment-VM-image-file-HOWTO



Not sure what you'd like to achieve it with Ryu.

thanks,

Re: VRRP

Isaku Yamahata — 2013-05-20T02:05:52

Not yet. The implementation needs to be integrated into Openstack and router
implementation. Patches are welcome.



No, you can't. In case of single node, the tunnel isn't used as optimization
because the packet is forwarded directly from one VM to another
VM in OVS bridge of the physical machine.

question about ryu

hsin han Liu — 2013-05-19T07:17:54

Hello


1.want to know more about ryu/app/simple_isolation.py and
ryu/app/simple_vlan.py ,also how to use it?

2.does ryu support vlan construction like
http://openvswitch.org/support/config-cookbooks/vlan-configuration-cookbook/
without openstack?


Thanks,

Allen
------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d_______________________________________________
Ryu-devel mailing list
Ryu-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org
https://lists.sourceforge.net/lists/listinfo/ryu-devel

VRRP

Agung Ridwan SN — 2013-05-18T08:33:23

Hi,

I just wondering if there is an app which ready to use for VRRP case.
The test seems works (https://github.com/osrg/ryu/wiki/Test-VRRP), when it
will publish to the ryu/app directory? Is it possible to run that VRRP with
network from openstack? One more, how to capture GRE tunnel packet from
single node installation? I found OF packet but no GRE. Thanks
------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d_______________________________________________
Ryu-devel mailing list
Ryu-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Re: Testing RYU

Kiran Kumar — 2013-05-18T05:41:11

Fujita,

Thanks a lot for the links and other information. Let me go through the
information and update.

Thanks,
Kiran


On Fri, May 17, 2013 at 1:54 PM, FUJITA Tomonori <
fujita.tomonori-Zyj7fXuS5i5L9jVzuh4AOg< at >public.gmane.org> wrote:

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d_______________________________________________
Ryu-devel mailing list
Ryu-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Re: Using OFPQueueGetConfigRequest

FUJITA Tomonori — 2013-05-17T21:23:18

On Fri, 17 May 2013 11:29:53 +0200
Philipp Aeschlimann <aepp-xXYtEe5Xh1A< at >public.gmane.org> wrote:


Applied, thanks!

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

[PATCH] docs: fix ryu module import

FUJITA Tomonori — 2013-05-17T21:00:50

readthedocs.org complains about the failure about ryu module import.

=
From: FUJITA Tomonori <fujita.tomonori-Zyj7fXuS5i5L9jVzuh4AOg< at >public.gmane.org>
Date: Sat, 18 May 2013 05:36:21 +0900
Subject: [PATCH] docs: fix import

Signed-off-by: FUJITA Tomonori <fujita.tomonori-Zyj7fXuS5i5L9jVzuh4AOg< at >public.gmane.org>
---
 doc/source/conf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index ebccb2c..4caf9b0 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
< at >< at > -12,12 +12,13 < at >< at >
 # serve to show the default.
 
 import sys, os
-from ryu import version as ryu_version
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../..'))
+
+from ryu import version as ryu_version
 
 # -- General configuration -----------------------------------------------------

Re: [PATCH] app/quantum_adapter: unbreak quantum change

FUJITA Tomonori — 2013-05-17T20:58:21

On Fri, 17 May 2013 10:08:51 +0900
Isaku Yamahata <yamahata-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org> wrote:


Applied.

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

Re: [PATCH] app/gre_tunnel: pylint

FUJITA Tomonori — 2013-05-17T20:58:30

On Fri, 17 May 2013 10:08:50 +0900
Isaku Yamahata <yamahata-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org> wrote:


Applied.

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

Re: [PATCH 0/2] RFC: OFPxxx -> string conversion

FUJITA Tomonori — 2013-05-17T20:57:24

On Wed, 15 May 2013 16:27:16 +0900
YAMAMOTO Takashi <yamamoto-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org> wrote:


Applied, thanks.

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

Re: [PATCH] use dpid_to_str in some places

FUJITA Tomonori — 2013-05-17T20:57:13

On Wed, 15 May 2013 10:22:37 +0900
YAMAMOTO Takashi <yamamoto-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org> wrote:


Applied, thanks.

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

Re: Testing RYU

FUJITA Tomonori — 2013-05-17T20:54:18

Hi,

On Thu, 16 May 2013 10:41:53 -0700
Kiran Kumar <kirankumar.pnm-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org> wrote:


The following works for you?

https://github.com/osrg/ryu/wiki/OpenFlow_Tutorial


Not tied. OpenStack is one of our applications. You can find some in
app directory, for example, we have firewall application:

https://github.com/osrg/ryu/wiki/Third-Party-Tools,-Etc.


Yes. Ryu supports OF1.0 with Nicira extentions, OF1.2, OF1.3. Ryu also
support OVSDB JSON protocol. You can fully control OVS via Ryu.


Not much. We are still working on docs the internal of Ryu.

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

[PATCH v2 5/6] snmp/mib/instances: add __RYU-MIB modulewhich is currently empty

Isaku Yamahata — 2013-05-17T11:11:43

Signed-off-by: Isaku Yamahata <yamahata-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org>
---
 ryu/services/snmp/mibs/instances/__RYU-MIB.py |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 ryu/services/snmp/mibs/instances/__RYU-MIB.py

diff --git a/ryu/services/snmp/mibs/instances/__RYU-MIB.py b/ryu/services/snmp/mibs/instances/__RYU-MIB.py
new file mode 100644
index 0000000..faa055c
--- /dev/null
+++ b/ryu/services/snmp/mibs/instances/__RYU-MIB.py
< at >< at > -0,0 +1,17 < at >< at >
+# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013 Isaku Yamahata <yamahata at private email ne jp>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# nothing yet

[PATCH v2 2/6] services/snmp_agent: create snmp agentmodule

Isaku Yamahata — 2013-05-17T11:11:40

Signed-off-by: Isaku Yamahata <yamahata-jCdQPDEk3idL9jVzuh4AOg< at >public.gmane.org>
---
Changes v1 -> v2:
- added ryu/services/snmp/mib and ryu/services/snmp/mib/instances
---
 ryu/services/snmp/__init__.py                |   15 +++++++++++++++
 ryu/services/snmp/mibs/__init__.py           |   15 +++++++++++++++
 ryu/services/snmp/mibs/instances/__init__.py |   15 +++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 ryu/services/snmp/__init__.py
 create mode 100644 ryu/services/snmp/mibs/__init__.py
 create mode 100644 ryu/services/snmp/mibs/instances/__init__.py

diff --git a/ryu/services/snmp/__init__.py b/ryu/services/snmp/__init__.py
new file mode 100644
index 0000000..340a423
--- /dev/null
+++ b/ryu/services/snmp/__init__.py
< at >< at > -0,0 +1,15 < at >< at >
+# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013 Isaku Yamahata <yamahata at private email ne jp>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/ryu/services/snmp/mibs/__init__.py b/ryu/services/snmp/mibs/__init__.py
new file mode 100644
index 0000000..340a423
--- /dev/null
+++ b/ryu/services/snmp/mibs/__init__.py
< at >< at > -0,0 +1,15 < at >< at >
+# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013 Isaku Yamahata <yamahata at private email ne jp>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/ryu/services/snmp/mibs/instances/__init__.py b/ryu/services/snmp/mibs/instances/__init__.py
new file mode 100644
index 0000000..340a423
--- /dev/null
+++ b/ryu/services/snmp/mibs/instances/__init__.py
< at >< at > -0,0 +1,15 < at >< at >
+# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013 Isaku Yamahata <yamahata at private email ne jp>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

gmane.network.ryu.devel

Re: [PATCH 1/2] lib/packet/vrrp: fix is_valid()

Re: [PATCH] test_parser_v10: remove tests for __str__

[PATCH 2/2] tests/unit/packet/test_vrrp: add tests foris_valid()

[PATCH 1/2] lib/packet/vrrp: fix is_valid()

[PATCH] test_parser_v10: remove tests for __str__

Re: question about ryu

Re: question about ryu

Re: question about ryu

Re: VRRP

question about ryu

VRRP

Re: Testing RYU

Re: Using OFPQueueGetConfigRequest

[PATCH] docs: fix ryu module import

Re: [PATCH] app/quantum_adapter: unbreak quantum change

Re: [PATCH] app/gre_tunnel: pylint

Re: [PATCH 0/2] RFC: OFPxxx -> string conversion

Re: [PATCH] use dpid_to_str in some places

Re: Testing RYU

[PATCH v2 5/6] snmp/mib/instances: add __RYU-MIB modulewhich is currently empty

[PATCH v2 2/6] services/snmp_agent: create snmp agentmodule

Re: [PATCH] test_parser_v10: remove tests for str

[PATCH] test_parser_v10: remove tests for str