From cc2c786d93d4b0647113840d163c140cdffbc6da Mon Sep 17 00:00:00 2001
From: Thomas Duval <thomas.duval@orange.com>
Date: Thu, 30 Nov 2017 11:25:07 +0100
Subject: Fix a bug in manager startup

Change-Id: I1bbe61ff745501605fd279298a3d518e7b520f8a
---
 moonv4/moon_db/tests/configure_db.sh               |  9 ---
 moonv4/moon_db/tests/test_intraextension.py        | 44 -----------
 moonv4/moon_db/tests/test_tenant.py                | 86 ----------------------
 moonv4/moon_db/tests/unit_python/configure_db.sh   |  9 +++
 .../tests/unit_python/test_intraextension.py       | 44 +++++++++++
 moonv4/moon_db/tests/unit_python/test_tenant.py    | 86 ++++++++++++++++++++++
 moonv4/moon_gui/README.md                          | 63 ++++++++++++++++
 moonv4/moon_gui/readme.md                          | 63 ----------------
 moonv4/moon_manager/moon_manager/__main__.py       |  3 +-
 9 files changed, 204 insertions(+), 203 deletions(-)
 delete mode 100644 moonv4/moon_db/tests/configure_db.sh
 delete mode 100644 moonv4/moon_db/tests/test_intraextension.py
 delete mode 100644 moonv4/moon_db/tests/test_tenant.py
 create mode 100644 moonv4/moon_db/tests/unit_python/configure_db.sh
 create mode 100644 moonv4/moon_db/tests/unit_python/test_intraextension.py
 create mode 100644 moonv4/moon_db/tests/unit_python/test_tenant.py
 create mode 100644 moonv4/moon_gui/README.md
 delete mode 100644 moonv4/moon_gui/readme.md

diff --git a/moonv4/moon_db/tests/configure_db.sh b/moonv4/moon_db/tests/configure_db.sh
deleted file mode 100644
index bdc259fe..00000000
--- a/moonv4/moon_db/tests/configure_db.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-apt-get install mysql-server python-mysqldb python-pymysql
-
-mysql -uroot -ppassword <<EOF
-CREATE DATABASE moon DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
-GRANT ALL ON moon.* TO 'moonuser'@'%' IDENTIFIED BY 'password';
-GRANT ALL ON moon.* TO 'moonuser'@'localhost' IDENTIFIED BY 'password';
-EOF
diff --git a/moonv4/moon_db/tests/test_intraextension.py b/moonv4/moon_db/tests/test_intraextension.py
deleted file mode 100644
index a2267214..00000000
--- a/moonv4/moon_db/tests/test_intraextension.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-# This software is distributed under the terms and conditions of the 'Apache-2.0'
-# license which can be found in the file 'LICENSE' in this package distribution
-# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-
-
-import moon_db
-import uuid
-
-Connector = moon_db.Driver("sql", "mysql+pymysql://moonuser:password@localhost/moon")
-Connector.driver.init_db()
-
-
-def create_intra_extension(policy_model="policy_authz"):
-    ie = dict()
-    ie['id'] = uuid.uuid4().hex
-    ie["name"] = "test IE " + uuid.uuid4().hex
-    ie["policymodel"] = "policy_authz"
-    ie["description"] = "a simple description."
-    ie["model"] = policy_model
-    genre = "admin"
-    if "authz" in policy_model:
-        genre = "authz"
-    ie["genre"] = genre
-    # ref = self.admin_api.load_intra_extension_dict(self.root_api.root_admin_id,
-    #                                                intra_extension_dict=ie)
-    # self.admin_api.populate_default_data(ref)
-    return ie
-
-
-def test_get_intraextension():
-    t = Connector.driver.get_intra_extensions_dict()
-    assert type(t) == dict
-
-
-def test_set_intra_extension():
-    number_of_ie = len(Connector.driver.get_intra_extensions_dict())
-    ie = create_intra_extension()
-    data = Connector.driver.set_intra_extension_dict(ie['id'], ie)
-    assert type(data) == dict
-    assert len(Connector.driver.get_intra_extensions_dict()) == number_of_ie+1
-
-
-# TODO (dthom): all tests can be got from keystone-moon
diff --git a/moonv4/moon_db/tests/test_tenant.py b/moonv4/moon_db/tests/test_tenant.py
deleted file mode 100644
index 7e6cfa82..00000000
--- a/moonv4/moon_db/tests/test_tenant.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-# This software is distributed under the terms and conditions of the 'Apache-2.0'
-# license which can be found in the file 'LICENSE' in this package distribution
-# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-
-import moon_db
-import uuid
-
-Connector = moon_db.Driver("sql", "mysql+pymysql://moonuser:password@localhost/moon")
-Connector.driver.init_db()
-
-
-def test_get_tenants():
-    t = Connector.driver.get_tenants_dict()
-    print(t)
-    assert type(t) == dict
-
-
-def test_add_tenant():
-    new_tenant = {
-        "id": uuid.uuid4().hex,
-        "name": "demo",
-        "description": uuid.uuid4().hex,
-        "intra_authz_extension_id": "",
-        "intra_admin_extension_id": "",
-    }
-    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
-                                            tenant_dict=new_tenant)
-    data_id = list(data.keys())[0]
-    assert new_tenant["id"] == data_id
-    assert new_tenant["name"] == data[data_id]["name"]
-    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
-    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
-    data = Connector.driver.get_tenants_dict()
-    assert data != {}
-
-
-def test_del_tenant():
-    new_tenant = {
-        "id": uuid.uuid4().hex,
-        "name": "demo",
-        "description": uuid.uuid4().hex,
-        "intra_authz_extension_id": "",
-        "intra_admin_extension_id": "",
-    }
-    data = Connector.driver.get_tenants_dict()
-    number_of_tenant = len(data.keys())
-    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
-                                            tenant_dict=new_tenant)
-    data_id = list(data.keys())[0]
-    assert new_tenant["name"] == data[data_id]["name"]
-    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
-    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
-    data = Connector.driver.get_tenants_dict()
-    assert len(data.keys()) == number_of_tenant+1
-    Connector.driver.del_tenant(data_id)
-    data = Connector.driver.get_tenants_dict()
-    assert len(data.keys()) == number_of_tenant
-
-
-def test_set_tenant():
-    new_tenant = {
-        "id": uuid.uuid4().hex,
-        "name": "demo",
-        "description": uuid.uuid4().hex,
-        "intra_authz_extension_id": "123456",
-        "intra_admin_extension_id": "0987654",
-    }
-    data = Connector.driver.get_tenants_dict()
-    number_of_tenant = len(data.keys())
-    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
-                                            tenant_dict=new_tenant)
-    data_id = list(data.keys())[0]
-    assert new_tenant["name"] == data[data_id]["name"]
-    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
-    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
-    data = Connector.driver.get_tenants_dict()
-    assert len(data.keys()) == number_of_tenant+1
-
-    new_tenant["name"] = "demo2"
-    data = Connector.driver.set_tenant_dict(tenant_id=data_id, tenant_dict=new_tenant)
-    data_id = list(data.keys())[0]
-    assert new_tenant["name"] == data[data_id]["name"]
-    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
-    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
-
diff --git a/moonv4/moon_db/tests/unit_python/configure_db.sh b/moonv4/moon_db/tests/unit_python/configure_db.sh
new file mode 100644
index 00000000..bdc259fe
--- /dev/null
+++ b/moonv4/moon_db/tests/unit_python/configure_db.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+apt-get install mysql-server python-mysqldb python-pymysql
+
+mysql -uroot -ppassword <<EOF
+CREATE DATABASE moon DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+GRANT ALL ON moon.* TO 'moonuser'@'%' IDENTIFIED BY 'password';
+GRANT ALL ON moon.* TO 'moonuser'@'localhost' IDENTIFIED BY 'password';
+EOF
diff --git a/moonv4/moon_db/tests/unit_python/test_intraextension.py b/moonv4/moon_db/tests/unit_python/test_intraextension.py
new file mode 100644
index 00000000..a2267214
--- /dev/null
+++ b/moonv4/moon_db/tests/unit_python/test_intraextension.py
@@ -0,0 +1,44 @@
+# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# This software is distributed under the terms and conditions of the 'Apache-2.0'
+# license which can be found in the file 'LICENSE' in this package distribution
+# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
+
+
+import moon_db
+import uuid
+
+Connector = moon_db.Driver("sql", "mysql+pymysql://moonuser:password@localhost/moon")
+Connector.driver.init_db()
+
+
+def create_intra_extension(policy_model="policy_authz"):
+    ie = dict()
+    ie['id'] = uuid.uuid4().hex
+    ie["name"] = "test IE " + uuid.uuid4().hex
+    ie["policymodel"] = "policy_authz"
+    ie["description"] = "a simple description."
+    ie["model"] = policy_model
+    genre = "admin"
+    if "authz" in policy_model:
+        genre = "authz"
+    ie["genre"] = genre
+    # ref = self.admin_api.load_intra_extension_dict(self.root_api.root_admin_id,
+    #                                                intra_extension_dict=ie)
+    # self.admin_api.populate_default_data(ref)
+    return ie
+
+
+def test_get_intraextension():
+    t = Connector.driver.get_intra_extensions_dict()
+    assert type(t) == dict
+
+
+def test_set_intra_extension():
+    number_of_ie = len(Connector.driver.get_intra_extensions_dict())
+    ie = create_intra_extension()
+    data = Connector.driver.set_intra_extension_dict(ie['id'], ie)
+    assert type(data) == dict
+    assert len(Connector.driver.get_intra_extensions_dict()) == number_of_ie+1
+
+
+# TODO (dthom): all tests can be got from keystone-moon
diff --git a/moonv4/moon_db/tests/unit_python/test_tenant.py b/moonv4/moon_db/tests/unit_python/test_tenant.py
new file mode 100644
index 00000000..7e6cfa82
--- /dev/null
+++ b/moonv4/moon_db/tests/unit_python/test_tenant.py
@@ -0,0 +1,86 @@
+# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# This software is distributed under the terms and conditions of the 'Apache-2.0'
+# license which can be found in the file 'LICENSE' in this package distribution
+# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
+
+import moon_db
+import uuid
+
+Connector = moon_db.Driver("sql", "mysql+pymysql://moonuser:password@localhost/moon")
+Connector.driver.init_db()
+
+
+def test_get_tenants():
+    t = Connector.driver.get_tenants_dict()
+    print(t)
+    assert type(t) == dict
+
+
+def test_add_tenant():
+    new_tenant = {
+        "id": uuid.uuid4().hex,
+        "name": "demo",
+        "description": uuid.uuid4().hex,
+        "intra_authz_extension_id": "",
+        "intra_admin_extension_id": "",
+    }
+    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
+                                            tenant_dict=new_tenant)
+    data_id = list(data.keys())[0]
+    assert new_tenant["id"] == data_id
+    assert new_tenant["name"] == data[data_id]["name"]
+    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
+    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
+    data = Connector.driver.get_tenants_dict()
+    assert data != {}
+
+
+def test_del_tenant():
+    new_tenant = {
+        "id": uuid.uuid4().hex,
+        "name": "demo",
+        "description": uuid.uuid4().hex,
+        "intra_authz_extension_id": "",
+        "intra_admin_extension_id": "",
+    }
+    data = Connector.driver.get_tenants_dict()
+    number_of_tenant = len(data.keys())
+    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
+                                            tenant_dict=new_tenant)
+    data_id = list(data.keys())[0]
+    assert new_tenant["name"] == data[data_id]["name"]
+    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
+    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
+    data = Connector.driver.get_tenants_dict()
+    assert len(data.keys()) == number_of_tenant+1
+    Connector.driver.del_tenant(data_id)
+    data = Connector.driver.get_tenants_dict()
+    assert len(data.keys()) == number_of_tenant
+
+
+def test_set_tenant():
+    new_tenant = {
+        "id": uuid.uuid4().hex,
+        "name": "demo",
+        "description": uuid.uuid4().hex,
+        "intra_authz_extension_id": "123456",
+        "intra_admin_extension_id": "0987654",
+    }
+    data = Connector.driver.get_tenants_dict()
+    number_of_tenant = len(data.keys())
+    data = Connector.driver.add_tenant_dict(tenant_id=new_tenant['id'],
+                                            tenant_dict=new_tenant)
+    data_id = list(data.keys())[0]
+    assert new_tenant["name"] == data[data_id]["name"]
+    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
+    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
+    data = Connector.driver.get_tenants_dict()
+    assert len(data.keys()) == number_of_tenant+1
+
+    new_tenant["name"] = "demo2"
+    data = Connector.driver.set_tenant_dict(tenant_id=data_id, tenant_dict=new_tenant)
+    data_id = list(data.keys())[0]
+    assert new_tenant["name"] == data[data_id]["name"]
+    assert new_tenant["intra_authz_extension_id"] == data[data_id]["intra_authz_extension_id"]
+    assert new_tenant["intra_admin_extension_id"] == data[data_id]["intra_admin_extension_id"]
+
diff --git a/moonv4/moon_gui/README.md b/moonv4/moon_gui/README.md
new file mode 100644
index 00000000..ff6e5a97
--- /dev/null
+++ b/moonv4/moon_gui/README.md
@@ -0,0 +1,63 @@
+
+GUI for the Moon project
+================================
+
+This directory contains all the code for the Moon project
+It is designed to provide a running GUI of the Moon platform instance.
+
+
+## Usage
+
+### Prerequist
+-   `sudo apt-get install nodejs nodejs-legacy`
+-   `sudo npm install --global gulp-cli`
+
+
+### Install all packages 
+-   `cd  $MOON_HOME/moon_gui`
+-   `sudo npm install`
+
+### Run the GUI
+-   `gulp webServerDelivery`
+- Open your web browser
+
+
+## Configuration
+
+### Build the delivery package
+-   `gulp delivery`
+### Launch the Web Server
+-   `gulp webServerDelivery`
+
+### Development
+
+During the development it is possible to use following commands :
+-   `gulp build`
+Launch a Web Server
+-   `gulp webServer`
+- Gulp webServer will refresh the browser when a file related to the application changed
+  
+
+### Constants
+It is possible to change some constants (API endpoints)
+- $MOON_HOME/moon_gui/static/app/moon.constants.js
+
+
+### CORS
+
+The GUI need to connect itself to Keystone and Moon.
+Opening CORS to the GUI WebServer is required.
+
+In order to modify Keystone :
+
+`cd  $pathtoVmSpace/docker/keystone`
+
+Concerned file is run.sh 
+
+In order to modify Moon :
+
+`cd  $MOON_HOME/moon_interface/interface`
+
+Concerned file is http_server.py
+ 
+ 
diff --git a/moonv4/moon_gui/readme.md b/moonv4/moon_gui/readme.md
deleted file mode 100644
index ff6e5a97..00000000
--- a/moonv4/moon_gui/readme.md
+++ /dev/null
@@ -1,63 +0,0 @@
-
-GUI for the Moon project
-================================
-
-This directory contains all the code for the Moon project
-It is designed to provide a running GUI of the Moon platform instance.
-
-
-## Usage
-
-### Prerequist
--   `sudo apt-get install nodejs nodejs-legacy`
--   `sudo npm install --global gulp-cli`
-
-
-### Install all packages 
--   `cd  $MOON_HOME/moon_gui`
--   `sudo npm install`
-
-### Run the GUI
--   `gulp webServerDelivery`
-- Open your web browser
-
-
-## Configuration
-
-### Build the delivery package
--   `gulp delivery`
-### Launch the Web Server
--   `gulp webServerDelivery`
-
-### Development
-
-During the development it is possible to use following commands :
--   `gulp build`
-Launch a Web Server
--   `gulp webServer`
-- Gulp webServer will refresh the browser when a file related to the application changed
-  
-
-### Constants
-It is possible to change some constants (API endpoints)
-- $MOON_HOME/moon_gui/static/app/moon.constants.js
-
-
-### CORS
-
-The GUI need to connect itself to Keystone and Moon.
-Opening CORS to the GUI WebServer is required.
-
-In order to modify Keystone :
-
-`cd  $pathtoVmSpace/docker/keystone`
-
-Concerned file is run.sh 
-
-In order to modify Moon :
-
-`cd  $MOON_HOME/moon_interface/interface`
-
-Concerned file is http_server.py
- 
- 
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()
-- 
cgit 1.2.3-korg