aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuan HE <ruan.he@orange.com>2017-11-30 10:46:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-30 10:46:10 +0000
commitad7dc26ae556f04293a6cee2083d2c7fc14cc1f3 (patch)
treebacb6fbba2a19a3f36ce378b83ab4ac6196f82dd
parentff72d83d0d4adaecb8e8625a0f5331c51b3aa0bc (diff)
parentcc2c786d93d4b0647113840d163c140cdffbc6da (diff)
Merge "Fix a bug in manager startup"
-rw-r--r--moonv4/moon_db/tests/unit_python/configure_db.sh (renamed from moonv4/moon_db/tests/configure_db.sh)0
-rw-r--r--moonv4/moon_db/tests/unit_python/test_intraextension.py (renamed from moonv4/moon_db/tests/test_intraextension.py)0
-rw-r--r--moonv4/moon_db/tests/unit_python/test_tenant.py (renamed from moonv4/moon_db/tests/test_tenant.py)0
-rw-r--r--moonv4/moon_gui/README.md (renamed from moonv4/moon_gui/readme.md)0
-rw-r--r--moonv4/moon_manager/moon_manager/__main__.py3
5 files changed, 2 insertions, 1 deletions
diff --git a/moonv4/moon_db/tests/configure_db.sh b/moonv4/moon_db/tests/unit_python/configure_db.sh
index bdc259fe..bdc259fe 100644
--- a/moonv4/moon_db/tests/configure_db.sh
+++ b/moonv4/moon_db/tests/unit_python/configure_db.sh
diff --git a/moonv4/moon_db/tests/test_intraextension.py b/moonv4/moon_db/tests/unit_python/test_intraextension.py
index a2267214..a2267214 100644
--- a/moonv4/moon_db/tests/test_intraextension.py
+++ b/moonv4/moon_db/tests/unit_python/test_intraextension.py
diff --git a/moonv4/moon_db/tests/test_tenant.py b/moonv4/moon_db/tests/unit_python/test_tenant.py
index 7e6cfa82..7e6cfa82 100644
--- a/moonv4/moon_db/tests/test_tenant.py
+++ b/moonv4/moon_db/tests/unit_python/test_tenant.py
diff --git a/moonv4/moon_gui/readme.md b/moonv4/moon_gui/README.md
index ff6e5a97..ff6e5a97 100644
--- a/moonv4/moon_gui/readme.md
+++ b/moonv4/moon_gui/README.md
diff --git a/moonv4/moon_manager/moon_manager/__main__.py b/moonv4/moon_manager/moon_manager/__main__.py
index 0b264ce6..7d97f003 100644
--- a/moonv4/moon_manager/moon_manager/__main__.py
+++ b/moonv4/moon_manager/moon_manager/__main__.py
@@ -1,3 +1,4 @@
from moon_manager.server import main
-main()
+server = main()
+server.run()