fix load_apps() in AppManager class

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>

1 files changed, 9 insertions, 3 deletions

diff --git a/ryu/base/app_manager.py b/ryu/base/app_manager.py
index e65a6f3b..31e99985 100644
--- a/ryu/base/app_manager.py
+++ b/ryu/base/app_manager.py
@@ -287,13 +287,19 @@ class AppManager(object):
 
             services = []
             for key, context_cls in cls.context_iteritems():
-                cls = self.contexts_cls.setdefault(key, context_cls)
-                assert cls == context_cls
+                v = self.contexts_cls.setdefault(key, context_cls)
+                assert v == context_cls
 
                 if issubclass(context_cls, RyuApp):
                     services.extend(get_dependent_services(context_cls))
 
-            services.extend(get_dependent_services(cls))
+            # we can't load an app that will be initiataed for
+            # contexts.
+            context_modules = map(lambda x: x.__module__,
+                                  self.contexts_cls.values())
+            for i in get_dependent_services(cls):
+                if not i in context_modules:
+                    services.append(i)
             if services:
                 app_lists.extend(services)