summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2014-02-06 15:47:34 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-02-06 15:57:46 +0900
commit6973e848677d0f3ece986fbc36bb0b3e8031a88e (patch)
tree4f45fb56516dc03b203d6ca156d13e9a14a26773
parentb48772504f0daacac3e5f417c8e8bd179921c229 (diff)
tests: add a test case for ofproto_protocol
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/unit/cmd/dummy_openflow_app.py22
-rw-r--r--ryu/tests/unit/cmd/test_manager.py23
2 files changed, 43 insertions, 2 deletions
diff --git a/ryu/tests/unit/cmd/dummy_openflow_app.py b/ryu/tests/unit/cmd/dummy_openflow_app.py
new file mode 100644
index 00000000..614febcd
--- /dev/null
+++ b/ryu/tests/unit/cmd/dummy_openflow_app.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2013,2014 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013,2014 YAMAMOTO Takashi <yamamoto 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.
+
+from ryu.base import app_manager
+from ryu.ofproto import ofproto_v1_3
+
+
+class DummyOpenFlowApp(app_manager.RyuApp):
+ OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION]
diff --git a/ryu/tests/unit/cmd/test_manager.py b/ryu/tests/unit/cmd/test_manager.py
index 5c922a19..84c67c2b 100644
--- a/ryu/tests/unit/cmd/test_manager.py
+++ b/ryu/tests/unit/cmd/test_manager.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
-# Copyright (C) 2013 YAMAMOTO Takashi <yamamoto at valinux co jp>
+# Copyright (C) 2013,2014 Nippon Telegraph and Telephone Corporation.
+# Copyright (C) 2013,2014 YAMAMOTO Takashi <yamamoto 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.
@@ -45,7 +45,26 @@ class Test_Manager(unittest.TestCase):
def test_help(self):
main()
+ @staticmethod
+ def _reset_globals():
+ # hack to reset globals like SERVICE_BRICKS.
+ # assumption: this is the only test which actually starts RyuApp.
+ import ryu.base.app_manager
+ import ryu.ofproto.ofproto_protocol
+
+ reload(ryu.base.app_manager)
+ reload(ryu.ofproto.ofproto_protocol)
+
@mock.patch('sys.argv', new=['ryu-manager', '--verbose',
'ryu.tests.unit.cmd.dummy_app'])
def test_no_services(self):
+ self._reset_globals()
+ main()
+ self._reset_globals()
+
+ @mock.patch('sys.argv', new=['ryu-manager', '--verbose',
+ 'ryu.tests.unit.cmd.dummy_openflow_app'])
+ def test_openflow_app(self):
+ self._reset_globals()
main()
+ self._reset_globals()