summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-03-16of14: Update get async reply and set async implementation to follow specSimon Horman
The current get async reply and get async implementations follows that of of_protocol and OpenFlow 1.3. However, OpenFlow 1.4 defines a rather different format. This patch updates the implementation to follow the OpenFlow 1.4 specification. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add OFPAsyncConfigPropSimon Horman
This will be used by a revised implementations of get async request reply and set async Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add table status unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add table status supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add flow monitor reply message unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add flow monitor request unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16packet_data_generator: New ofproto dependency for v5 updatesSimon Horman
Update ofproto dependency to include a merge of the mainline v5 branch which includes: * Bundle messages * Flow monitor messages * Request Forward message * Table Status message * Fix for length of Flow Update Full entry of Flow Monitor reply message Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add flow monitor reply supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add flow monitor request supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16of14: Add OFPFlowUpdateSimon Horman
This will be used by flow monitor reply messages Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16dpset: absorb *args, **kwargs passed to __init__ISHIDA Wataru
dpset might be initialied implicitly like OFPHandler. In that case, _CONTEXTS are passed to dpset. so we should ignore them. Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ofctl_v1_2/3: Convert IP fields to string with dotted decimal maskWei-Li Tang
This enables match_ip*_to_str() functions to output IP address with dotted decimal subnet mask if the mask cannot be represented in CIDR format. Reported-by: Yi-Ching Lee <potatoching11@gmail.com> Reported-by: Li-Der Chou <cld@csie.ncu.edu.tw> Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16sw test tool: avoid test termination in initializationwatanabe.fumitaka
The initialization error of the flow tables causes forced termination of the test, and has become the hindrance of execution of other tests. This patch changes operation of the flow tables initialization error to avoid forced termination of the test. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ofctl_v1_2: Fix unsuitable logSatoshi Kobayashi
When using type 'ALL', the log unsuitable is outputted: Unknown type: ALL Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ofctl_v1_3: Fix unsuitable logSatoshi Kobayashi
ofproto_v1_3.OFPGT_ALL is 0 and 0 is False on Python. When using type 'ALL', the following is set to True. if not type_: LOG.debug('Unknown type: %s', group.get('type')) Therefore, the log unsuitable is outputted: Unknown type: ALL Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16library_packet.rst: fix an example codeYAMAMOTO Takashi
Reported by Sebastian Gebhard on ryu-devel@. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16pyang plugin to generate of_config.generated_classesYAMAMOTO Takashi
the current version of generated_classes was written by hand. this plugin allows it to be auto-generated from the yang module of OF-Config if/when it's available. unfortunately, there seems to be no yang modules usable for this purpose publically available yet, though. the yang module of OF-Config 1.1.1 is embedded in pdf. besides that it's hard to extract from the pdf, its license is unclear. OF-Config 1.2 says that its yang module is distributed as a separate file. but i couldn't find it on ONF site. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16fix NX_EXPERIMENTER_IDYAMAMOTO Takashi
also, comment registry url. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16reduce direct uses of oslo.config.cfg.CONFYAMAMOTO Takashi
no functional changes are intended. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ryu.cfg: re-export some frequently used stuff for convenienceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16add ryu.cfgYAMAMOTO Takashi
also, make CONF accessible via RyuApp.CONF. add a comment to explain the intention. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ryu.conf: obsoleted argument used in sample configurationWei-Li Tang
ofp_listen_port was obsoleted and users should use ofp_tcp_listen_port (or ofp_ssl_listen_port if ssl enabled) instead. Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-16ofctl_v1_2/3: IPv4 dotted decimal subnet mask supportWei-Li Tang
This enables to_match_ip() to accept IPv4 address with dotted decimal subnet mask or ACL hybrid CIDR. Given 3 match field values below: '192.168.1.0/24' '192.168.1.0/255.255.255.0' '192.168.1.0/0.0.0.255' These addresses are logically equivalent. Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-05Ryu 3.7FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-05test_parser: update expected json representationYAMAMOTO Takashi
Update after experimenter data change. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-05OFPPropCommonExperimenter4ByteData: change payload to bytesYAMAMOTO Takashi
Change experimenter data from a list of 32-bit words to bytes. Discussed on ryu-devel@. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-05Apply normalize_json.pyYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: Correct documentation of table mod flags and propertiesSimon Horman
* Document properties * The valid flags for OpenFlow 1.4 are OFPTC_EVICTION and OFPTC_VACANCY_EVENTS Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of13: Correct documentation of meter mod flagsSimon Horman
* Flags is a bitmap of OFPMF_* values rather than a single OFPMF_* value Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of13: Correct documentation of flow mod flagsSimon Horman
* Flags is a bitmap of OFPFF_* values rather than a single OFPFF_* value Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of13: Correct documentation of set config flagsSimon Horman
* Flags is a bitmap of OFPC_FRAG_* values rather than a single OFPC_FRAG_* value * OFPC_FRAG_MASK is not a valid bitmap field Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of13: Correct documentation and example of get config reply flagsSimon Horman
* Flags is a bitmap of OFPC_FRAG_* values rather than a single OFPC_FRAG_* value * OFPC_FRAG_MASK is not a valid bitmap field Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: Correct documentation of flow mod flagsSimon Horman
* Flags is a bitmap of OFPFF_* values rather than a single OFPFF_* value Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: Correct documentation of meter mod flagsSimon Horman
* Flags is a bitmap of OFPMF_* values rather than a single OFPMF_* value Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: Correct documentation of set config flagsSimon Horman
* Flags is a bitmap of OFPC_FRAG_* values rather than a single OFPC_FRAG_* value * OFPC_FRAG_MASK is not a valid bitmap field Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: Correct documentation and example of get config reply flagsSimon Horman
* Flags is a bitmap of OFPC_FRAG_* values rather than a single OFPC_FRAG_* value * OFPC_FRAG_MASK is not a valid bitmap field Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of14: set default attributes for meter-related classesYuichi Ito
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04of13: set default attributes for meter-related classesYuichi Ito
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04fix load_apps() in AppManager classFUJITA Tomonori
fix the following bug: http://sourceforge.net/p/ryu/mailman/message/32022286/ Dependent services are not loaded properly with '_CONTEXTS'. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-03-04six.add_metaclass requires six>=1.4.0Wei-Li Tang
python-six package from Ubuntu 12.04 LTS remains version 1.1.0, which prevents ryu-manager from being started and raises exception "AttributeError: 'module' object has no attribute 'add_metaclass'". Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-27of14: Add experimenter property to port mod reply unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add port mod experimenter propertySimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add optical property to port mod reply unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add port mod optical propertySimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Remove _PACK_STR from port mod ethernet propertySimon Horman
Use OFP_PORT_MOD_PROP_ETHERNET_PACK_STR in and remove _PACK_STR from OFPPortModPropEthernet. Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add experimenter property to port stats reply unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add port stats experimenter propertySimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add optical property to port stats reply unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au>
2014-02-27of14: Add experimenter property to port status unit testSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> -- v3 * Correct indentation v2 * First post
2014-02-27ofctl_v1_3:support whole of match fieldsKiyonari Harigae
Signed-off-by: Kiyonari Harigae <lakshmi@cloudysunny14.org> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>