8c1978942d
This patch simplifies integrated OVS test suite. Currently, we wait for a barrier response before moving to the next test. However, we don't need. The logic works like the following: sending a flow mod (deleting all the flows) sending a barrier sending a flow mod (set up a flow to test) sending a barrier sending a flow stats Then the reply handler for flow stats verifies the result and move to the next. You can run a test suite like: $ ryu-manager ~/git/ryu/ryu/tests/integrated/test_add_flow_v12_actions.py We can try two more suites: ryu/tests/integrated/test_add_flow_v10.py ryu/tests/integrated/test_add_flow_v12_matches.py Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
79 lines
1.9 KiB
Python
Executable File
79 lines
1.9 KiB
Python
Executable File
#!/usr/bin/env python
|
|
#
|
|
# Copyright (C) 2011, 2012 Nippon Telegraph and Telephone Corporation.
|
|
# Copyright (C) 2011 Isaku Yamahata <yamahata at valinux co 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.
|
|
|
|
import gevent
|
|
import gflags
|
|
import logging
|
|
import sys
|
|
|
|
from gevent import monkey
|
|
monkey.patch_all()
|
|
|
|
from ryu import log
|
|
log.early_init_log(logging.DEBUG)
|
|
|
|
from ryu import version
|
|
from ryu import utils
|
|
from ryu.app import wsgi
|
|
from ryu.base.app_manager import AppManager
|
|
from ryu.controller import controller
|
|
|
|
|
|
FLAGS = gflags.FLAGS
|
|
gflags.DEFINE_bool('version', False, 'output version information and exit')
|
|
gflags.DEFINE_multistring('app_lists',
|
|
[],
|
|
'application module name to run')
|
|
|
|
|
|
def main():
|
|
utils.find_flagfile()
|
|
args = FLAGS(sys.argv)
|
|
|
|
if FLAGS.version:
|
|
print 'ryu-manager %s' % version
|
|
sys.exit(0)
|
|
|
|
log.init_log()
|
|
|
|
if len(args) > 1:
|
|
FLAGS.app_lists += args[1:]
|
|
|
|
app_mgr = AppManager()
|
|
app_mgr.load_apps(FLAGS.app_lists)
|
|
contexts = app_mgr.create_contexts()
|
|
app_mgr.instantiate_apps(**contexts)
|
|
|
|
services = []
|
|
|
|
ctlr = controller.OpenFlowController()
|
|
thr = gevent.spawn_later(0, ctlr)
|
|
services.append(thr)
|
|
|
|
webapp = wsgi.start_service(app_mgr)
|
|
if webapp:
|
|
thr = gevent.spawn_later(0, webapp)
|
|
services.append(thr)
|
|
|
|
gevent.joinall(services)
|
|
app_mgr.close()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|