summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2012-06-02discard sample/test_simple_switch because of unittest failFUJITA Tomonori
unittest crashes on commit e5e4b8442: ERROR: testInit (ryu.tests.unit.sample.test_simple_switch.TestSimpleSwitch) Traceback (most recent call last): File "/var/lib/jenkins/jobs/ryu-test-upstream/workspace/ryu/tests/unit/sample/test_simple_switch.py", line 20, in testInit ss = SimpleSwitch() File "/var/lib/jenkins/jobs/ryu-test-upstream/workspace/ryu/app/simple_switch.py", line 44, in __init__ self.mac2port = kwargs['mac2port'] KeyError: 'mac2port' The simple_switch unittest doesn't test anything anyway so let's remove it for now. This also fixes a pip8 error of simple_switch.py that the commit e5e4b8442 added. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-06-01test: add NTT copyright to unittest filesFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-06-01app/simple_switch: fix commit e5e4b844250d36788f9b1bf71cfd36a6e14d5315 ↵FUJITA Tomonori
regression Traceback (most recent call last): File "bin/ryu-manager", line 71, in <module> main() File "bin/ryu-manager", line 53, in main app_mgr.instantiate_apps(**contexts) File "/Users/fujita/git/ryu/ryu/base/app_manager.py", line 102, in instantiate_apps app = cls(*args, **kwargs) File "/Users/fujita/git/ryu/ryu/app/simple_switch.py", line 44, in __init__ self.mac2port = kwargs['mac2port'] KeyError: 'mac2port' Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-30ryu/app: convert existing application to new style ryu applicationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-30base/app_manager: introduce application contextIsaku Yamahata
The ryu-manager creates structures which applications share. Currently it is hard-coded in ryu-managers. Concretely network.Network and dpset.DPSet. It is difficult to maintain the code appropriately by hand. When the application is changed or new application comes in, ryu-manager also must be updated. So introduce the notion of application context so that application manager can determine what structures applications want to share and create them. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-28add NXT_ROLE_REPLY supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-28Add Switch to Controller Nicira extension message supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-28Add Switch to Controller Vendor message supportFUJITA Tomonori
This enabls a vendor to register vendor's specific parser to handle Switch to Controller Vendor messages. An object that vendor's parser returns is placed at msg.data. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-28test: add more unittestsFUJITA Tomonori
* MsgBase set_xid * of1.0 - NXActionSetQueue - NXActionPopQueue - NXActionExit - NXTRoleRequest - NXActionAutopath * of1.2 msg_parser Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-25Fix NXActionAutopath parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24test: add unittests for of1.2 parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24test: add more unittests for of1.0 parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24test: add more unittests for of parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24Fix OFPFlowRemoved __str__ method typoFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24Fix OFPVendorStats parser methodFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24Fix OFPSwitchFeatures parser (of 1.2)FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24Fix the commit 458042d4032ad52dff93deb0f78d94cadb4f2d37 messupFUJITA Tomonori
Add Nicira Extension NXAST_POP_QUEUE constants Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24Fix the commit eea434b8e45bc8ee91aa02096903a66af898ae35 messupFUJITA Tomonori
Add Nicira Extension NXAST_SET_QUEUE constants Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-23Fix OFPFlowStats parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-22Add Nicira Extension NXAST_POP_QUEUE supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-22Add Nicira Extension NXAST_SET_QUEUE supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-22add Nicira Extension NXAST_AUTOPATH supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-22add Nicira Extension NXAST_EXIT supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-21Fix NXActionSetTunnel64 parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-21Fix NXAactionOutputReg parserFUJITA Tomonori
Pass the proper variable. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-21rename NXTRequest to NiciraHeaderFUJITA Tomonori
We use NXTRequest for Switch-to-Controller messages so let's rename it to an appropriate name. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-21add NXT_ROLE_REQUEST supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-21Add NXT_ROLE_REQUEST/REPLY constantsFUJITA Tomonori
NXT_ROLE_REQUEST/REPLY use the same on-wire format (NX_ROLE_PACK_STR). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-20ryu/controller/dpset.py: code simplificationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20lib/dpid: dpid formatter/parserIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20Kill parser_stats_body_array method in OFPFlowStats classFUJITA Tomonori
OFPStatsReply needs to handle variable-length bodys so having two parsers (parser_stats_body_array and parser_stats_body) doesn't make sense. Just kill parser_stats_body_array(). cls_stats_body_cls_size is also pointless since OFPStatsReply needs to handle variable-length bodys. OFPStatsReply class needs to know if a stats class is array or not. So register_stats_type takes 'body_single_struct' instead of body_cls_size. We need to change this scheme if we need to handle VendorStats in the same way (both array and single struct). But currently we don't even have any VendorStats implementation so let's invent something more complicated when it becomes necessary. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-20fix OFPQueueGetConfigReply parserFUJITA Tomonori
msg.port should not be a tuple. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20fix OFPVendor parserFUJITA Tomonori
msg.vendor should not be tuple. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20fix typo in ofproto_v1_0_parser commentFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-19fix StatsReply parserFUJITA Tomonori
OFPStatsReply parser_stats_body_array needs body classes to have length field. We could set length as class-wide constants for classes having a fixed length however we have two classes that need a variable length so let's set the length in the same way for all the stats classes. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-18Fix OFPQueuePropMinRate classFUJITA Tomonori
- __str__ method: needs to pass a tuple to msg_str_attr - parser method: rate shouldn't be a tuple. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-18fix OFPPacketQueue class parserFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-15ryu/app/wsapi: make json_parse_message_body workIsaku Yamahata
json_parse_message_body() didn't work. This patch fixes it. > File "ryu/app/wsapi.py", line 129, in json_parse_message_body > content = request.content.read() > AttributeError: WSRequest instance has no attribute 'content' > Traceback (most recent call last): Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14Pretty NXAcationBundleBase parser upFUJITA Tomonori
Use '()' instead of '\' Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14fix NXActionRegLoad parserFUJITA Tomonori
fix a syntax bug and typo. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14fix NXActionRegMove parserFUJITA Tomonori
fix a syntax bug and typo. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14fix NXActionMultipath parserFUJITA Tomonori
Fix a syntax bug. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14add Nicira Extension NXAST_OUTPUT_REG supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-14add Nicira Extension NXAST_BUNDLE and NXAST_BUNDLE_LOAD supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14add Nicira Extension NXAST_REG_LOAD supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-14add Nicira Extension NXAST_REG_MOVE supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-10Fix OFPStatsReply parserFUJITA Tomonori
ryu crashes when it gets OFPT_STATS_REPLY including OFP actions. ofp_flow_stats can include ofp_action_header(s) so parser_stats_body_array method can't use the entry_size argument (the minimum size, 88 bytes). It needs to use the size that body_cls's parser returns. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-08Add NXAction parser supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-08Add OFPActionStripVlan classFUJITA Tomonori
Avoid hitting the assert in OFPAction class' parser method. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07lib/mac: improve helper functionsIsaku Yamahata
- docstring - add sanity check as haddr_to_bin() is used to parse user-giving string Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>