summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2013-03-25topology: switch discovering moduleYAMADA Hideki
This is an alternative of dpset, which supports event passing. event.py: event class switches.py: switch(datapath) discovery app using ofp_event dumper.py: test and example app using switch discovery event Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-25event: Add sync flag and event src for request/replyYAMADA Hideki
- To distinguish synchronous request or not. - Event src is needed for asynchronous request too. Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18TLS: use a full spelling of a cli optionYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18TLS: test cli options consistently in the same lineYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18TLS: update an example outputYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18ofconfig: use ElementTree iterator instead of getchildrenYAMAMOTO Takashi
getchildren is documented to be obsolete. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18ryu.controller.controller.Datapath: keep handler list regardless of stateYoshihiro Kaneko
The list of handler to be called for the OFP message should be kept even if the state is changed in a handler. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18vsctl: fix timeoutYAMAMOTO Takashi
- run_command's timeout argument is named 'timeout_msec', but all callers seem to pass the value in second. so rename the argument to 'timeout_sec'. - gevent.Timeout takes a timeout value in second. remove a conversion, which seems wrong even if the argument was in ms. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18tunnel_port_updater: g/c _LOCKYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-18packet lib: fix icmpv6.nd parserHIYAMA Manabu
Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08doc: of_config libraryIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08of_config: sample test code to use ofconfig capable_switchIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08of_config: OF capable switch class to issue OFConfig requestIsaku Yamahata
This class implements direct API to ofconfig. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08of_config: constants for of-configIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08of_config/schema: add missing importIsaku Yamahata
Otherwise lxml.etree.XMLSchema complains. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08of_config: import XML schema files for OF config.Isaku Yamahata
Import XML schema files for OF config. They are stolen from flowflowarding of_config. NOTE: They adds operation attribute where they accepts. When we supports another OF-config capable switch, they needs to be updated. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08netconf: add constants for netconfIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08netconf: improve schema for netconfIsaku Yamahata
RFC6241 defines only message layer, doesn't operation layer. So adds definitions for operation layer. Note: notification layer is still missing yet. Plus indentation fix. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08netconf: import XML schema for netconfIsaku Yamahata
This is from IANA defined by RFC6241. stolen from http://www.iana.org/assignments/xml-registry/schema/netconf.xsd Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08netconf: import xml schemaIsaku Yamahata
This is stolen from flowforwarding enetconf git://github.com/FlowForwarding/enetconf.git enetconf/priv/xml.xsd This is a slimmed down version of http://www.w3.org/2001/xml.xsd. Without this, validator can access to network when loading/validating XML. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-08MANIFEST.in: include XML schema filesIsaku Yamahata
Later XML schema will be added. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-07ofp: send events to others before calling own handlersFUJITA Tomonori
Some own handlers change the state so needs to send events before calling own handlers. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06wsgi: remove unused logging codeFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06doc: fix bug in tls.rstOHMURA Kei
We need to use absolute file names when running set-ssl command. Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06log-cleanup: honor --default-log-level in case of --verboseYAMAMOTO Takashi
if the default log level is explicitly specified by --default-log-level option, use the level rather than defaulting to logging.DEBUG. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06log-cleanup: per RyuApp loggerYAMAMOTO Takashi
let RyuApp provide its own logger. use it instead of per-module logger where appropriate. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06log-cleanup: remove an unused logger instanceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06log-cleanup: remove an unused logger instanceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06ryu-manager: stop modifying CONF.app_listYAMAMOTO Takashi
to make cli show-options a little prettier. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06of1.3: fix error in group_modZhang Dongya
Signed-off-by: Zhang Dongya <fortitude.zhang@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-05Add request/reply event support to support communication between appsFUJITA Tomonori
What most of applications need to do is: 1) register a handler to catch a specific event 2) The handler does multiple asynchronous tasks (query dbs, configures switches, etc). 2) can be implemented in an asynchronous way, that is sending multiple requests at the same time. However, I don't think most of developers need to do or want to do. The API to handle multiple asynchrnous tasks in a synchronous way is more handy. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-05ryu.log: change type of --use_syslog option to Boolean.EisukeTAKAHASHI
---------- $ ryu-manager --help (....) --use-syslog USE_SYSLOG output to syslog $ ryu-manager --use-syslog usage: ryu-manager [-h] [--version] [--verbose] [--noverbose] [--use-stderr] (....) ryu-manager: error: argument --use-syslog: expected one argument ---------- Signed-off-by: EisukeTAKAHASHI <takahashi.eisuke@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-05contrib ncclient: missing commaIsaku Yamahata
comma(",") is missing. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-05contrib: import ncclient library (NETCONF clients)FUJITA Tomonori
NETCONF clients https://github.com/leopoul/ncclient/ Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-04of1.3: fix a comment typoYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-04revert s/_/-/ changes for ryu.confYAMAMOTO Takashi
cfg.py automatically replaces '-' in option names to '_' for config files. so s/_/-/ in this file was a mistake. revert the commit. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03fix missing parameter in calling 'msg_pack_info' of OFPActionPushMpls/PopMplsZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03add missing 'field' parameter to __init__ function of OFPActionSetFieldZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03fix incorrect naming '__serialize_body' in OFPRoleRequestZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03fix OFPMatch decode error in 'parser' function of OFPFlowRemovedZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03add missing 'length' field of OFPPort when decodingZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03add missing 'match' parameter to __init__ function of OFPAggregateStatsRequestZhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03fix error in OFP_DESC_PACK_STR (change 'c' to 's')Zhang Dongya
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-02remove port_no argument of OFPPortDescStatsRequest.__init__YAMAMOTO Takashi
according to OF1.3/1.3.1 spec, the request body is empty. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-02fix OFPMultipartRequest._serialize_stats_bodyYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-01test of1.2: fix typos from mid to minKONDOH Tasuku
Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-28g/c --monkey-patch optionYAMAMOTO Takashi
this obscure option seems to have been a no-op since the initial commit. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-28test of1.2: add test code of OFPErrorExperimenterMsgKONDOH Tasuku
- add test code of max and min to OFPErrorExperimenterMsg Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-28Ryu 1.7FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-27RyuApp: allows observers to specify stateFUJITA Tomonori
This fixes the following exception: > $ ryu-manager ryu_app(OF1.2 app) > $ sudo mn --controller remote 127.0.0.1 > $ sudo ovs-vsctl set bridge s1 protocols='[OpenFlow10,OpenFlow12]' > connected socket:<socket fileno=4 sock=127.0.0.1:6633 peer=127.0.0.1:60456> address:('127.0.0.1', 60456) > EVENT ofp_event->dpset EventOFPStateChange > connected socket:<socket fileno=10 sock=127.0.0.1:6633 peer=127.0.0.1:60457> address:('127.0.0.1', 60457) > EVENT ofp_event->dpset EventOFPStateChange > hello ev <ryu.controller.ofp_event.EventOFPHello object at 0x11bf550> > unsupported version 0x1. If possible, set the switch to use one of the versions [3] > error msg ev version: 0x3 msg_type 0x1 xid 0xc84d9220 type 0x1 code 0x1 0x3 0x1 0x0 0x5f 0xc8 0x4d 0x92 0x20 0x0 0x0 0x0 0x0 0x75 0x6e 0x73 0x75 0x70 0x70 0x6f > +0x72 0x74 0x65 0x64 0x20 0x76 0x65 0x72 0x73 0x69 0x6f 0x6e 0x20 0x30 0x78 0x31 0x2e 0x20 0x49 0x66 0x20 0x70 0x6f 0x73 0x73 0x69 0x62 0x6c 0x65 0x2c 0x20 0x73 > +0x65 0x74 0x20 0x74 0x68 0x65 0x20 0x73 0x77 0x69 0x74 0x63 0x68 > EVENT ofp_event->dpset EventOFPPortStatus > DPSET: A port was modified.(datapath id = None, port number = 1) > Traceback (most recent call last): > File "/usr/lib/python2.7/dist-packages/gevent/greenlet.py", line 390, in run > result = self._run(*self.args, **self.kwargs) > File "/usr/local/lib/python2.7/dist-packages/ryu-1.6-py2.7.egg/ryu/base/app_manager.py", line 86, in _event_loop > handler(ev) > File "/usr/local/lib/python2.7/dist-packages/ryu-1.6-py2.7.egg/ryu/controller/dpset.py", line 192, in port_status_handler > self.port_state[datapath.id].modify(port.port_no, port) > KeyError: None > <Greenlet at 0x11bc518: <bound method DPSet._event_loop of <ryu.controller.dpset.DPSet object at 0xd0df10>>> failed with KeyError Reported-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 23:21:21 +0000