On Sun, 13 May 2012 21:03:00 +0900 FUJITA Tomonori <[email protected]> wrote:
> Signed-off-by: FUJITA Tomonori <[email protected]> > --- > ryu/ofproto/ofproto_v1_0.py | 9 +++++++++ > ryu/ofproto/ofproto_v1_0_parser.py | 36 > ++++++++++++++++++++++++++++++++++++ > 2 files changed, 45 insertions(+), 0 deletions(-) > > diff --git a/ryu/ofproto/ofproto_v1_0.py b/ryu/ofproto/ofproto_v1_0.py Forgot to implement parser method. Here's an updated one. = >From 47d7fce0f017a5a28e8a2ef811b7bdf6bea9295d Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori <[email protected]> Date: Mon, 14 May 2012 09:50:42 +0900 Subject: [PATCH 3/4] add Nicira Extension NXAST_BUNDLE_LOAD support Signed-off-by: FUJITA Tomonori <[email protected]> --- ryu/ofproto/ofproto_v1_0.py | 9 ++++++ ryu/ofproto/ofproto_v1_0_parser.py | 50 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_0.py b/ryu/ofproto/ofproto_v1_0.py index 3052664..90bfdf4 100644 --- a/ryu/ofproto/ofproto_v1_0.py +++ b/ryu/ofproto/ofproto_v1_0.py @@ -238,6 +238,7 @@ NXAST_REG_MOVE = 6 NXAST_REG_LOAD = 7 NXAST_SET_TUNNEL64 = 9 NXAST_MULTIPATH = 10 +NXAST_BUNDLE_LOAD = 13 NXAST_RESUBMIT_TABLE = 14 NX_ACTION_RESUBMIT_PACK_STR = '!HHIHHB3x' @@ -264,6 +265,10 @@ NX_ACTION_MULTIPATH_PACK_STR = '!HHIHHH2xHHI2xHI' NX_ACTION_MULTIPATH_SIZE = 32 assert calcsize(NX_ACTION_MULTIPATH_PACK_STR) == NX_ACTION_MULTIPATH_SIZE +NX_ACTION_BUNDLE_LOAD_PACK_STR = '!HHIHHHHIHHI4x' +NX_ACTION_BUNDLE_LOAD_SIZE = 32 +assert calcsize(NX_ACTION_BUNDLE_LOAD_PACK_STR) == NX_ACTION_BUNDLE_LOAD_SIZE + NX_ACTION_HEADER_PACK_STR = '!HHIH' NX_ACTION_HEADER_SIZE = 10 assert calcsize(NX_ACTION_HEADER_PACK_STR) == NX_ACTION_HEADER_SIZE @@ -634,3 +639,7 @@ NX_MP_ALG_MODULO_N = 0 NX_MP_ALG_HASH_THRESHOLD = 1 NX_MP_ALG_HRW = 2 NX_MP_ALG_ITER_HASH = 3 + +# enum nx_bd_algorithm +NX_BD_ALG_ACTIVE_BACKUP = 0 +NX_BD_ALG_HRW = 1 diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index f345de8..73a3465 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -580,6 +580,56 @@ class NXActionMultipath(NXActionHeader): dst) [email protected]_nx_action_subtype(ofproto_v1_0.NXAST_BUNDLE_LOAD) +class NXActionBundleLoad(NXActionHeader): + def __init__(self, algorithm, fields, basis, slave_type, n_slaves, + ofs_nbits, dst, slaves): + _len = ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_SIZE + len(slaves) * 2 + _len += (_len % 8) + super(NXActionBundleLoad, self).__init__( + ofproto_v1_0.NXAST_BUNDLE_LOAD, _len) + self.algorithm = algorithm + self.fields = fields + self.basis = basis + self.slave_type = slave_type + self.n_slaves = n_slaves + self.ofs_nbits = ofs_nbits + self.dst = dst + self.slaves = slaves + + def serialize(self, buf, offset): + slave_offset = offset + ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_SIZE + + for s in self.slaves: + msg_pack_into('!H', buf, slave_offset, s) + slave_offset += 2 + + pad_len = (len(self.slaves) * 2 + ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_SIZE) % 8 + if pad_len != 0: + msg_pack_into('%dx' % pad_len, buf, slave_offset) + + msg_pack_into(ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_PACK_STR, buf, + offset, self.type, self.len, self.vendor, self.subtype, + self.algorithm, self.fields, self.basis, + self.slave_type, self.n_slaves, + self.ofs_nbits, self.dst) + + @classmethod + def parser(cls, buf, offset): + type_, len_, vendor, subtype, algorithm, fields, basis, slave_type, n_slaves, ofs_nbits, dst = struct.unpack_from( + ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_PACK_STR, buf, offset) + slave_offset = offset + ofproto_v1_0.NX_ACTION_BUNDLE_LOAD_SIZE + + slaves = [] + for i in range(0, n_slaves): + s = struct.unpack_from('!H', buf, slave_offset) + slaves.append(s[0]) + slave_offset += 2 + + return cls(algorithm, fields, basis, slave_type, + n_slaves, ofs_nbits, dst, slaves) + + class OFPDescStats(collections.namedtuple('OFPDescStats', ('mfr_desc', 'hw_desc', 'sw_desc', 'serial_num', 'dp_desc'))): @classmethod -- 1.7.4.4 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
