aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancois.cellier <francois.cellier@orange.com>2018-03-12 17:00:47 +0100
committerThomas Duval <thomas.duval@orange.com>2018-03-15 16:16:07 +0100
commit8c4396c505ea245af4a542cf87b185a010484f5f (patch)
tree4f4a00943af0914b6180fba14cf6ab3388fed2db
parent73326131f58c5ca208cd54025e12ee9de543d4a7 (diff)
use the threading capability of Flask app; set the number of manager to 1
Change-Id: Ia700f83898de33372c52969f774ee8aa642ee36c
-rw-r--r--moon_authz/Changelog30
-rw-r--r--moon_authz/moon_authz/__init__.py2
-rw-r--r--moon_authz/moon_authz/http_server.py4
-rw-r--r--moon_interface/Changelog28
-rw-r--r--moon_interface/moon_interface/__init__.py2
-rw-r--r--moon_interface/moon_interface/http_server.py2
-rw-r--r--moon_manager/Changelog30
-rw-r--r--moon_manager/moon_manager/api/pdp.py2
-rw-r--r--moon_manager/moon_manager/http_server.py2
-rw-r--r--moon_orchestrator/Changelog4
-rw-r--r--moon_orchestrator/moon_orchestrator/__init__.py2
-rw-r--r--moon_orchestrator/moon_orchestrator/http_server.py2
-rw-r--r--moon_wrapper/Changelog28
-rw-r--r--moon_wrapper/moon_wrapper/__init__.py2
-rw-r--r--moon_wrapper/moon_wrapper/http_server.py2
-rw-r--r--tools/moon_kubernetes/templates/moon_manager.yaml2
16 files changed, 132 insertions, 12 deletions
diff --git a/moon_authz/Changelog b/moon_authz/Changelog
new file mode 100644
index 00000000..59d7f8e4
--- /dev/null
+++ b/moon_authz/Changelog
@@ -0,0 +1,30 @@
+# Copyright 2018 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'.
+
+
+CHANGES
+=======
+
+1.0.0
+-----
+- First version of the manager
+
+2.0.0
+-----
+- Version built inside the Keystone component
+
+3.0.0
+-----
+- Version built outside the Keystone component
+
+4.0.0
+-----
+- First micro-architecture version
+
+4.3.3
+-----
+- use the threading capability of Flask app
+- set the number of manager to 1
+- update to the latest version of the python-moondb library
diff --git a/moon_authz/moon_authz/__init__.py b/moon_authz/moon_authz/__init__.py
index 6f964a63..0fb32055 100644
--- a/moon_authz/moon_authz/__init__.py
+++ b/moon_authz/moon_authz/__init__.py
@@ -3,4 +3,4 @@
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "4.3.2"
+__version__ = "4.3.3"
diff --git a/moon_authz/moon_authz/http_server.py b/moon_authz/moon_authz/http_server.py
index b6ac6426..7d3b1ec3 100644
--- a/moon_authz/moon_authz/http_server.py
+++ b/moon_authz/moon_authz/http_server.py
@@ -94,7 +94,7 @@ class Root(Resource):
class HTTPServer(Server):
- def __init__(self, host="0.0.0.0", port=38001, **kwargs):
+ def __init__(self, host="localhost", port=38001, **kwargs):
super(HTTPServer, self).__init__(host=host, port=port, **kwargs)
self.component_data = kwargs.get("component_data", {})
logger.info("HTTPServer port={} {}".format(port, kwargs))
@@ -135,4 +135,4 @@ class HTTPServer(Server):
)
def run(self):
- self.app.run(host=self._host, port=self._port) # nosec
+ self.app.run(host=self._host, port=self._port, threaded=True) # nosec
diff --git a/moon_interface/Changelog b/moon_interface/Changelog
new file mode 100644
index 00000000..f58682a9
--- /dev/null
+++ b/moon_interface/Changelog
@@ -0,0 +1,28 @@
+# Copyright 2018 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'.
+
+
+CHANGES
+=======
+
+1.0.0
+-----
+- First version of the manager
+
+2.0.0
+-----
+- Version built inside the Keystone component
+
+3.0.0
+-----
+- Version built outside the Keystone component
+
+4.0.0
+-----
+- First micro-architecture version
+
+4.3.3
+-----
+- use the threading capability of Flask app
diff --git a/moon_interface/moon_interface/__init__.py b/moon_interface/moon_interface/__init__.py
index 6f964a63..0fb32055 100644
--- a/moon_interface/moon_interface/__init__.py
+++ b/moon_interface/moon_interface/__init__.py
@@ -3,4 +3,4 @@
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "4.3.2"
+__version__ = "4.3.3"
diff --git a/moon_interface/moon_interface/http_server.py b/moon_interface/moon_interface/http_server.py
index a2e25377..1e0858c0 100644
--- a/moon_interface/moon_interface/http_server.py
+++ b/moon_interface/moon_interface/http_server.py
@@ -133,4 +133,4 @@ class HTTPServer(Server):
)
def run(self):
- self.app.run(host=self._host, port=self._port) # nosec
+ self.app.run(host=self._host, port=self._port, threaded=True) # nosec
diff --git a/moon_manager/Changelog b/moon_manager/Changelog
new file mode 100644
index 00000000..2bd01595
--- /dev/null
+++ b/moon_manager/Changelog
@@ -0,0 +1,30 @@
+# Copyright 2018 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'.
+
+
+CHANGES
+=======
+
+1.0.0
+-----
+- First version of the manager
+
+2.0.0
+-----
+- Version built inside the Keystone component
+
+3.0.0
+-----
+- Version built outside the Keystone component
+
+4.0.0
+-----
+- First micro-architecture version
+
+4.5.2
+-----
+- use the threading capability of Flask app
+- set the number of manager to 1
+- update to the latest version of the python-moondb library
diff --git a/moon_manager/moon_manager/api/pdp.py b/moon_manager/moon_manager/api/pdp.py
index 78931e1f..4bc34a24 100644
--- a/moon_manager/moon_manager/api/pdp.py
+++ b/moon_manager/moon_manager/api/pdp.py
@@ -73,7 +73,7 @@ def add_pod(uuid, data):
time.sleep(1)
else:
break
- logger.info(req.text)
+ logger.info("Pod add request answer : {}".format(req.text))
def check_keystone_pid(k_pid):
diff --git a/moon_manager/moon_manager/http_server.py b/moon_manager/moon_manager/http_server.py
index 76d04599..128d5b74 100644
--- a/moon_manager/moon_manager/http_server.py
+++ b/moon_manager/moon_manager/http_server.py
@@ -158,4 +158,4 @@ class HTTPServer(Server):
def run(self):
self.__check_if_db_is_up()
- self.app.run(host=self._host, port=self._port) # nosec
+ self.app.run(host=self._host, port=self._port, threaded=True) # nosec
diff --git a/moon_orchestrator/Changelog b/moon_orchestrator/Changelog
index 31aabf5d..783c9130 100644
--- a/moon_orchestrator/Changelog
+++ b/moon_orchestrator/Changelog
@@ -23,3 +23,7 @@ CHANGES
-----
- add bootstrap file to start Orchestrator with all configuration
+4.4.1
+-----
+- the processing of a request is now performed in a thread
+
diff --git a/moon_orchestrator/moon_orchestrator/__init__.py b/moon_orchestrator/moon_orchestrator/__init__.py
index 85c245e0..bc8f2781 100644
--- a/moon_orchestrator/moon_orchestrator/__init__.py
+++ b/moon_orchestrator/moon_orchestrator/__init__.py
@@ -3,4 +3,4 @@
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "4.4.0"
+__version__ = "4.4.1"
diff --git a/moon_orchestrator/moon_orchestrator/http_server.py b/moon_orchestrator/moon_orchestrator/http_server.py
index 85e29cd0..1cb12618 100644
--- a/moon_orchestrator/moon_orchestrator/http_server.py
+++ b/moon_orchestrator/moon_orchestrator/http_server.py
@@ -158,7 +158,7 @@ class HTTPServer(Server):
})
def run(self):
- self.app.run(host=self._host, port=self._port) # nosec
+ self.app.run(host=self._host, port=self._port, threaded=True) # nosec
@staticmethod
def __filter_str(data):
diff --git a/moon_wrapper/Changelog b/moon_wrapper/Changelog
new file mode 100644
index 00000000..071e4ef9
--- /dev/null
+++ b/moon_wrapper/Changelog
@@ -0,0 +1,28 @@
+# Copyright 2018 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'.
+
+
+CHANGES
+=======
+
+1.0.0
+-----
+- First version of the manager
+
+2.0.0
+-----
+- Version built inside the Keystone component
+
+3.0.0
+-----
+- Version built outside the Keystone component
+
+4.0.0
+-----
+- First micro-architecture version
+
+4.5.1
+-----
+- use the threading capability of Flask app
diff --git a/moon_wrapper/moon_wrapper/__init__.py b/moon_wrapper/moon_wrapper/__init__.py
index 903c6518..98a98146 100644
--- a/moon_wrapper/moon_wrapper/__init__.py
+++ b/moon_wrapper/moon_wrapper/__init__.py
@@ -3,4 +3,4 @@
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "0.1.0"
+__version__ = "4.5.1"
diff --git a/moon_wrapper/moon_wrapper/http_server.py b/moon_wrapper/moon_wrapper/http_server.py
index f23af182..dfbaed9f 100644
--- a/moon_wrapper/moon_wrapper/http_server.py
+++ b/moon_wrapper/moon_wrapper/http_server.py
@@ -136,5 +136,5 @@ class HTTPServer(Server):
)
def run(self):
- self.app.run(host=self._host, port=self._port) # nosec
+ self.app.run(host=self._host, port=self._port, threaded=True) # nosec
diff --git a/tools/moon_kubernetes/templates/moon_manager.yaml b/tools/moon_kubernetes/templates/moon_manager.yaml
index 28913f48..2c3705ad 100644
--- a/tools/moon_kubernetes/templates/moon_manager.yaml
+++ b/tools/moon_kubernetes/templates/moon_manager.yaml
@@ -4,7 +4,7 @@ metadata:
name: manager
namespace: moon
spec:
- replicas: 3
+ replicas: 1
template:
metadata:
labels: