aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4
diff options
context:
space:
mode:
authorRHE <rebirthmonkey@gmail.com>2017-11-28 13:11:09 +0100
committerRHE <rebirthmonkey@gmail.com>2017-11-28 13:11:09 +0100
commit337031d5e14ab89b1fb9b24b7bfdc6e66e5ca8af (patch)
treef14cce0a766ca8fc6b805c01d90428957a496174 /moonv4
parent920a49cfa055733d575282973e23558c33087a4a (diff)
moonv4 clean up
Change-Id: Ied1e065f941e59bf9a75545436b7ac09174942fa
Diffstat (limited to 'moonv4')
-rw-r--r--moonv4/moon_consul/Changelog13
-rw-r--r--moonv4/moon_consul/Dockerfile37
-rw-r--r--moonv4/moon_consul/LICENSE204
-rw-r--r--moonv4/moon_consul/MANIFEST.in11
-rw-r--r--moonv4/moon_consul/README.md9
-rw-r--r--moonv4/moon_consul/moon_consul/__init__.py1
-rw-r--r--moonv4/moon_consul/moon_consul/__main__.py3
-rw-r--r--moonv4/moon_consul/moon_consul/api/__init__.py0
-rw-r--r--moonv4/moon_consul/moon_consul/api/database.py72
-rw-r--r--moonv4/moon_consul/moon_consul/api/generic.py78
-rw-r--r--moonv4/moon_consul/moon_consul/api/messenger.py67
-rw-r--r--moonv4/moon_consul/moon_consul/api/openstack.py63
-rw-r--r--moonv4/moon_consul/moon_consul/api/slave.py72
-rw-r--r--moonv4/moon_consul/moon_consul/api/system.py169
-rw-r--r--moonv4/moon_consul/moon_consul/http_server.py134
-rw-r--r--moonv4/moon_consul/moon_consul/server.py82
-rw-r--r--moonv4/moon_consul/requirements.txt5
-rw-r--r--moonv4/moon_consul/setup.py50
-rw-r--r--moonv4/moon_router/Dockerfile11
-rw-r--r--moonv4/moon_router/LICENSE204
-rw-r--r--moonv4/moon_router/MANIFEST.in9
-rw-r--r--moonv4/moon_router/README.md18
-rw-r--r--moonv4/moon_router/doc/api-moon-secrouter.pdfbin195778 -> 0 bytes
-rw-r--r--moonv4/moon_router/doc/api.pdfbin195377 -> 0 bytes
-rw-r--r--moonv4/moon_router/moon_router/__init__.py6
-rw-r--r--moonv4/moon_router/moon_router/__main__.py3
-rw-r--r--moonv4/moon_router/moon_router/api/__init__.py0
-rw-r--r--moonv4/moon_router/moon_router/api/generic.py46
-rw-r--r--moonv4/moon_router/moon_router/api/route.py472
-rw-r--r--moonv4/moon_router/moon_router/messenger.py69
-rw-r--r--moonv4/moon_router/moon_router/server.py63
-rw-r--r--moonv4/moon_router/requirements.txt7
-rw-r--r--moonv4/moon_router/setup.py46
-rw-r--r--moonv4/moon_router/tests/moon_db-0.1.0.tar.gzbin21423 -> 0 bytes
-rw-r--r--moonv4/moon_router/tests/moon_policy-0.1.0.tar.gzbin8640 -> 0 bytes
35 files changed, 0 insertions, 2024 deletions
diff --git a/moonv4/moon_consul/Changelog b/moonv4/moon_consul/Changelog
deleted file mode 100644
index 5ccc3c27..00000000
--- a/moonv4/moon_consul/Changelog
+++ /dev/null
@@ -1,13 +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'.
-
-
-CHANGES
-=======
-
-0.1.0
------
-- First version of the moon_consul component.
-
diff --git a/moonv4/moon_consul/Dockerfile b/moonv4/moon_consul/Dockerfile
deleted file mode 100644
index 1d3c7108..00000000
--- a/moonv4/moon_consul/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Pull base image.
-FROM ubuntu:latest
-
-ENV DB_URL="mysql+pymysql://moon:p4sswOrd1@db/moon"
-ENV DB_DRIVER=sql
-ENV TRANSPORT_URL="rabbit://moon:p4sswOrd1@messenger:5672/moon"
-ENV DOCKER_URL="unix://var/run/docker.sock"
-ENV SLAVE_NAME=
-ENV MASTER_URL=
-ENV MASTER_LOGIN=
-ENV MASTER_PASSWORD=
-ENV INTERFACE_PORT=8080
-ENV CONSUL_HOST="172.88.88.88"
-ENV CONSUL_PORT=88
-ENV KEYSTONE_URL="http://keystone:5000/v3"
-ENV KEYSTONE_USER=admin
-ENV KEYSTONE_PASSWORD=p4ssw0rd
-ENV KEYSTONE_DOMAIN=default
-ENV KEYSTONE_PROJECT=admin
-ENV KEYSTONE_CHECK_TOKEN=False
-ENV KEYSTONE_SERVER_CRT=False
-ENV PLUGIN_CONTAINERS="asteroide/authz:latest,asteroide/session:latest"
-ENV COMPONENTS_PORT_START=38001
-
-RUN apt-get update && apt-get install python3.5 python3-pip -y
-
-RUN pip3 install pip --upgrade
-#RUN pip3 install moon_db
-
-ADD . /root
-
-WORKDIR /root/
-RUN pip3 install -r requirements.txt
-RUN pip3 install .
-EXPOSE ${CONSUL_PORT}
-
-CMD ["python3", "-m", "moon_consul"] \ No newline at end of file
diff --git a/moonv4/moon_consul/LICENSE b/moonv4/moon_consul/LICENSE
deleted file mode 100644
index 4143aac2..00000000
--- a/moonv4/moon_consul/LICENSE
+++ /dev/null
@@ -1,204 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
---- License for python-keystoneclient versions prior to 2.1 ---
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of this project nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/moonv4/moon_consul/MANIFEST.in b/moonv4/moon_consul/MANIFEST.in
deleted file mode 100644
index ba8a657e..00000000
--- a/moonv4/moon_consul/MANIFEST.in
+++ /dev/null
@@ -1,11 +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'.
-
-include README.rst
-include LICENSE
-include setup.py
-include requirements.txt
-# graft tests
-graft bin \ No newline at end of file
diff --git a/moonv4/moon_consul/README.md b/moonv4/moon_consul/README.md
deleted file mode 100644
index afee9be5..00000000
--- a/moonv4/moon_consul/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-DB module for the Moon project
-==============================
-
-This package contains the database module for the Moon project
-It is designed to provide a driver to access the Moon database.
-
-For any other information, refer to the parent project:
-
- https://git.opnfv.org/moon
diff --git a/moonv4/moon_consul/moon_consul/__init__.py b/moonv4/moon_consul/moon_consul/__init__.py
deleted file mode 100644
index 3dc1f76b..00000000
--- a/moonv4/moon_consul/moon_consul/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.1.0"
diff --git a/moonv4/moon_consul/moon_consul/__main__.py b/moonv4/moon_consul/moon_consul/__main__.py
deleted file mode 100644
index 4d64288e..00000000
--- a/moonv4/moon_consul/moon_consul/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from moon_consul.server import main
-
-main()
diff --git a/moonv4/moon_consul/moon_consul/api/__init__.py b/moonv4/moon_consul/moon_consul/api/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/moonv4/moon_consul/moon_consul/api/__init__.py
+++ /dev/null
diff --git a/moonv4/moon_consul/moon_consul/api/database.py b/moonv4/moon_consul/moon_consul/api/database.py
deleted file mode 100644
index 5533b1a5..00000000
--- a/moonv4/moon_consul/moon_consul/api/database.py
+++ /dev/null
@@ -1,72 +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'.
-"""
-Assignments allow to connect data with elements of perimeter
-
-"""
-
-from flask import request
-from flask_restful import Resource
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_interface.tools import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class Database(Resource):
- """
- Endpoint for database requests
- """
-
- __urls__ = (
- "/configuration/database",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self):
- """Retrieve database configuration
-
- :return: {
- "database": {
- "hostname": "hostname for the main database",
- "port": "port for the main database",
- "user": "user for the main database",
- "password": "password for the main database",
- "protocol": "protocol to use (eg. mysql+pymysql)",
- "driver": "driver to use",
- }
- }
- """
- url = self.conf.DB_URL
- driver = self.conf.DB_DRIVER
- hostname = url.split("@")[-1].split(":")[0].split("/")[0]
- try:
- port = int(url.split("@")[-1].split(":")[1].split("/")[0])
- except ValueError:
- port = None
- except IndexError:
- port = None
- user = url.split("//")[1].split(":")[0]
- # TODO: password must be encrypted
- password = url.split(":")[2].split("@")[0]
- protocol = url.split(":")[0]
- return {
- "database": {
- "hostname": hostname,
- "port": port,
- "user": user,
- "password": password,
- "protocol": protocol,
- "driver": driver
- }
- }
-
diff --git a/moonv4/moon_consul/moon_consul/api/generic.py b/moonv4/moon_consul/moon_consul/api/generic.py
deleted file mode 100644
index 69f25eef..00000000
--- a/moonv4/moon_consul/moon_consul/api/generic.py
+++ /dev/null
@@ -1,78 +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'.
-"""
-Those API are helping API used to manage the Moon platform.
-"""
-
-from flask_restful import Resource, request
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_utilities.security_functions import call
-import moon_consul.api
-# from moon_utilities.auth import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class API(Resource):
- """
- Endpoint for API requests
- """
-
- __urls__ = (
- "/api",
- "/api/",
- "/api/<string:group_id>",
- "/api/<string:group_id>/",
- "/api/<string:group_id>/<string:endpoint_id>")
-
- # @check_auth
- def get(self, group_id="", endpoint_id="", user_id=""):
- """Retrieve all API endpoints or a specific endpoint if endpoint_id is given
-
- :param group_id: the name of one existing group (ie generic, ...)
- :param endpoint_id: the name of one existing component (ie Logs, Status, ...)
- :return: {
- "group_name": {
- "endpoint_name": {
- "description": "a description",
- "methods": {
- "get": "description of the HTTP method"
- },
- "urls": ('/api', '/api/', '/api/<string:endpoint_id>')
- }
- }
- """
- __methods = ("get", "post", "put", "delete", "options", "patch")
- api_list = filter(lambda x: "__" not in x, dir(moon_consul.api))
- api_desc = dict()
- for api_name in api_list:
- api_desc[api_name] = {}
- group_api_obj = eval("moon_interface.api.{}".format(api_name))
- api_desc[api_name]["description"] = group_api_obj.__doc__
- if "__version__" in dir(group_api_obj):
- api_desc[api_name]["version"] = group_api_obj.__version__
- object_list = list(filter(lambda x: "__" not in x, dir(group_api_obj)))
- for obj in map(lambda x: eval("moon_interface.api.{}.{}".format(api_name, x)), object_list):
- if "__urls__" in dir(obj):
- api_desc[api_name][obj.__name__] = dict()
- api_desc[api_name][obj.__name__]["urls"] = obj.__urls__
- api_desc[api_name][obj.__name__]["methods"] = dict()
- for _method in filter(lambda x: x in __methods, dir(obj)):
- docstring = eval("moon_interface.api.{}.{}.{}.__doc__".format(api_name, obj.__name__, _method))
- api_desc[api_name][obj.__name__]["methods"][_method] = docstring
- api_desc[api_name][obj.__name__]["description"] = str(obj.__doc__)
- if group_id in api_desc:
- if endpoint_id in api_desc[group_id]:
- return {group_id: {endpoint_id: api_desc[group_id][endpoint_id]}}
- elif len(endpoint_id) > 0:
- LOG.error("Unknown endpoint_id {}".format(endpoint_id))
- return {"error": "Unknown endpoint_id {}".format(endpoint_id)}
- return {group_id: api_desc[group_id]}
- return api_desc
-
diff --git a/moonv4/moon_consul/moon_consul/api/messenger.py b/moonv4/moon_consul/moon_consul/api/messenger.py
deleted file mode 100644
index 28026baf..00000000
--- a/moonv4/moon_consul/moon_consul/api/messenger.py
+++ /dev/null
@@ -1,67 +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'.
-"""
-Assignments allow to connect data with elements of perimeter
-
-"""
-
-from flask import request
-from flask_restful import Resource
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_interface.tools import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class Messenger(Resource):
- """
- Endpoint for messenger requests
- """
-
- __urls__ = (
- "/configuration/messenger",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self):
- """Retrieve messenger configuration
-
- :return: {
- "messenger": {
- "hostname": "hostname for the messenger server",
- "port": "port for the main messenger server",
- "user": "user for the main messenger server",
- "password": "password for the main messenger server",
- "protocol": "protocol to use (eg. rabbit)"
- }
- }
- """
- url = self.conf.TRANSPORT_URL
- hostname = url.split("@")[-1].split(":")[0].split("/")[0]
- try:
- port = int(url.split("@")[-1].split(":")[1].split("/")[0])
- except ValueError:
- port = None
- user = url.split("//")[1].split(":")[0]
- # TODO: password must be encrypted
- password = url.split(":")[2].split("@")[0]
- protocol = url.split(":")[0]
- return {
- "messenger": {
- "hostname": hostname,
- "port": port,
- "user": user,
- "password": password,
- "protocol": protocol,
- }
- }
-
diff --git a/moonv4/moon_consul/moon_consul/api/openstack.py b/moonv4/moon_consul/moon_consul/api/openstack.py
deleted file mode 100644
index 5d776981..00000000
--- a/moonv4/moon_consul/moon_consul/api/openstack.py
+++ /dev/null
@@ -1,63 +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'.
-"""
-Assignments allow to connect data with elements of perimeter
-
-"""
-
-from flask import request
-from flask_restful import Resource
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_interface.tools import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class Keystone(Resource):
- """
- Endpoint for Keystone requests
- """
-
- __urls__ = (
- "/configuration/os/keystone",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self):
- """Retrieve Keystone configuration
-
- :return: {
- "keystone": {
- "url": "hostname for the Keystone server",
- "user": "user for the Keystone server",
- "password": "password for the Keystone server",
- "domain": "domain to use against Keystone server",
- "project": "main project to use",
- "check_token": "yes, no or strict",
- "server_crt": "certificate to use when using https"
- }
- }
- """
- # TODO: password must be encrypted
- # TODO: check_token is a sensitive information it must not be update through the network
- return {
- "keystone": {
- "url": self.conf.KEYSTONE_URL,
- "user": self.conf.KEYSTONE_USER,
- "password": self.conf.KEYSTONE_PASSWORD,
- "domain": self.conf.KEYSTONE_DOMAIN,
- "project": self.conf.KEYSTONE_PROJECT,
- "check_token": self.conf.KEYSTONE_CHECK_TOKEN,
- "server_crt": self.conf.KEYSTONE_SERVER_CRT
- }
- }
-
diff --git a/moonv4/moon_consul/moon_consul/api/slave.py b/moonv4/moon_consul/moon_consul/api/slave.py
deleted file mode 100644
index 7f8acb28..00000000
--- a/moonv4/moon_consul/moon_consul/api/slave.py
+++ /dev/null
@@ -1,72 +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'.
-"""
-Assignments allow to connect data with elements of perimeter
-
-"""
-
-from flask import request
-from flask_restful import Resource
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_interface.tools import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class Slave(Resource):
- """
- Endpoint for slave requests
- """
-
- __urls__ = (
- "/configuration/slave",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self):
- """Retrieve slave configuration
-
- If current server is a slave:
- :return: {
- "slave": {
- "name": "name of the slave",
- "master_url": "URL of the master",
- "user": [
- {
- "username": "user to be used to connect to the master",
- "password": "password to be used to connect to the master"
- }
- ]
- }
- }
- else:
- :return: {
- "slave": {}
- }
- """
- # TODO: password must be encrypted
- if self.conf.SLAVE_NAME:
- return {
- "slave": {
- "name": self.conf.SLAVE_NAME,
- "master_url": self.conf.MASTER_URL,
- "user": [
- {
- "username": self.conf.MASTER_LOGIN,
- "password": self.conf.MASTER_PASSWORD
- }
- ]
- }
- }
- else:
- return {"slave": {}}
-
diff --git a/moonv4/moon_consul/moon_consul/api/system.py b/moonv4/moon_consul/moon_consul/api/system.py
deleted file mode 100644
index e21d9de2..00000000
--- a/moonv4/moon_consul/moon_consul/api/system.py
+++ /dev/null
@@ -1,169 +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'.
-"""
-Assignments allow to connect data with elements of perimeter
-
-"""
-
-from flask import request
-from flask_restful import Resource
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_interface.tools import check_auth
-
-__version__ = "0.1.0"
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-
-
-class Docker(Resource):
- """
- Endpoint for system requests
- """
-
- __urls__ = (
- "/configuration/docker",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self):
- """Retrieve docker configuration
-
- :return: {
- "docker": {
- "url": "hostname for the docker server (eg. /var/run/docker.sock)",
- "port": "port of the server",
- "user": "user of the server",
- "password": "password of the server",
- "protocol": "protocol to use (eg. unix)"
- }
- }
- """
- url = self.conf.DOCKER_URL
- # LOG.info(url)
- # hostname = url.split("@")[-1].split(":")[0].split("/")[0]
- # try:
- # port = int(url.split("@")[-1].split(":")[1].split("/")[0])
- # except ValueError:
- # port = None
- # user = url.split("//")[1].split(":")[0]
- # # TODO: password must be encrypted
- # try:
- # password = url.split(":")[2].split("@")[0]
- # except IndexError:
- # password = ""
- # protocol = url.split(":")[0]
- return {
- "docker": {
- "url": self.conf.DOCKER_URL,
- # "port": port,
- # "user": user,
- # "password": password,
- # "protocol": protocol,
- }
- }
-
-
-class Components(Resource):
- """
- Endpoint for requests on components
- """
-
- __urls__ = (
- "/configuration/components",
- "/configuration/components/",
- "/configuration/components/<string:id_or_name>",
- )
-
- def __init__(self, *args, **kwargs):
- self.conf = kwargs.get('conf', {})
-
- # @check_auth
- def get(self, id_or_name=None):
- """Retrieve component list
-
- :param id_or_name: ID or name of the component
-
- :return: {
- "components": [
- {
- "hostname": "hostname of the component",
- "port": "port of the server in this component",
- "id": "id of the component",
- "keystone_id": "Keystone project ID served by this component if needed"
- },
- ]
- }
- """
- if id_or_name:
- for _component in self.conf.COMPONENTS:
- if id_or_name in (_component["hostname"], _component["id"]):
- return {
- "components": [_component, ]
- }
- return {"components": []}
- return {"components": self.conf.COMPONENTS}
-
- # @check_auth
- def put(self, id_or_name=None):
- """Ask for adding a new component
- The response gives the TCP port to be used
-
- :param id_or_name: ID or name of the component
- :request body: {
- "hostname": "hostname of the new component",
- "keystone_id": "Keystone ID mapped to that component (if needed)"
- }
- :return: {
- "components": [
- {
- "hostname": "hostname of the component",
- "port": "port of the server in this component",
- "id": "id of the component",
- "keystone_id": "Keystone project ID served by this component"
- }
- ]
- }
- """
- if not id_or_name:
- return "Need a name for that component", 400
- for _component in self.conf.COMPONENTS:
- if id_or_name in (_component["hostname"], _component["id"]):
- return "ID already used", 409
- self.conf.COMPONENTS_PORT_START += 1
- port = self.conf.COMPONENTS_PORT_START
- data = request.json
- new_component = {
- "hostname": data.get("hostname", id_or_name),
- "port": port,
- "id": id_or_name,
- "keystone_id": data.get("keystone_id", "")
- }
- self.conf.COMPONENTS.append(new_component)
- return {
- "components": [new_component, ]
- }
-
- # @check_auth
- def delete(self, id_or_name=None):
- """Delete a component
-
- :param id_or_name: ID or name of the component
- :return: {
- "result": true
- }
- """
- if not id_or_name:
- return "Need a name for that component", 400
- for index, _component in enumerate(self.conf.COMPONENTS):
- if id_or_name in (_component["hostname"], _component["id"]):
- self.conf.COMPONENTS.pop(index)
- return {"result": True}
- return "Cannot find component named {}".format(id_or_name), 403
-
diff --git a/moonv4/moon_consul/moon_consul/http_server.py b/moonv4/moon_consul/moon_consul/http_server.py
deleted file mode 100644
index c3d13378..00000000
--- a/moonv4/moon_consul/moon_consul/http_server.py
+++ /dev/null
@@ -1,134 +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'.
-
-from flask import Flask, request
-from flask_cors import CORS, cross_origin
-from flask_restful import Resource, Api, reqparse
-import logging
-from moon_consul import __version__
-from moon_consul.api.generic import API
-from moon_consul.api.database import Database
-from moon_consul.api.messenger import Messenger
-from moon_consul.api.openstack import Keystone
-from moon_consul.api.slave import Slave
-from moon_consul.api.system import Docker, Components
-from moon_utilities import exceptions
-
-logger = logging.getLogger(__name__)
-
-
-class Server:
- """Base class for HTTP server"""
-
- def __init__(self, host="localhost", port=80, api=None, **kwargs):
- """Run a server
-
- :param host: hostname of the server
- :param port: port for the running server
- :param kwargs: optional parameters
- :return: a running server
- """
- self._host = host
- self._port = port
- self._api = api
- self._extra = kwargs
-
- @property
- def host(self):
- return self._host
-
- @host.setter
- def host(self, name):
- self._host = name
-
- @host.deleter
- def host(self):
- self._host = ""
-
- @property
- def port(self):
- return self._port
-
- @port.setter
- def port(self, number):
- self._port = number
-
- @port.deleter
- def port(self):
- self._port = 80
-
- def run(self):
- raise NotImplementedError()
-
-__API__ = (
- API,
- Database, Docker, Messenger, Keystone, Slave, Components
- )
-
-
-class Root(Resource):
- """
- The root of the web service
- """
- __urls__ = ("/", )
- __methods = ("get", "post", "put", "delete", "options")
-
- def get(self):
- tree = {"/": {"methods": ("get",), "description": "List all methods for that service."}}
- for item in __API__:
- tree[item.__name__] = {"urls": item.__urls__}
- _methods = []
- for _method in self.__methods:
- if _method in dir(item):
- _methods.append(_method)
- tree[item.__name__]["methods"] = _methods
- tree[item.__name__]["description"] = item.__doc__.strip()
- return {
- "version": __version__,
- "tree": tree
- }
-
-
-class HTTPServer(Server):
-
- def __init__(self, host="localhost", port=80, conf=None, **kwargs):
- super(HTTPServer, self).__init__(host=host, port=port, **kwargs)
- self.app = Flask(__name__)
- self.conf = conf
- # Todo : specify only few urls instead of *
- # CORS(self.app)
- self.api = Api(self.app)
- self.__set_route()
- # self.__hook_errors()
-
- @self.app.errorhandler(exceptions.AuthException)
- def _auth_exception(error):
- return {"error": "Unauthorized"}, 401
-
- def __hook_errors(self):
- # FIXME (dthom): it doesn't work
- def get_404_json(e):
- return {"error": "Error", "code": 404, "description": e}
- self.app.register_error_handler(404, get_404_json)
-
- def get_400_json(e):
- return {"error": "Error", "code": 400, "description": e}
- self.app.register_error_handler(400, lambda e: get_400_json)
- self.app.register_error_handler(403, exceptions.AuthException)
-
- def __set_route(self):
- self.api.add_resource(Root, '/')
-
- for api in __API__:
- self.api.add_resource(
- api, *api.__urls__,
- resource_class_kwargs={
- "conf": self.conf,
- }
- )
-
- def run(self):
- self.app.run(debug=True, host=self._host, port=self._port) # nosec
-
diff --git a/moonv4/moon_consul/moon_consul/server.py b/moonv4/moon_consul/moon_consul/server.py
deleted file mode 100644
index 7d42228b..00000000
--- a/moonv4/moon_consul/moon_consul/server.py
+++ /dev/null
@@ -1,82 +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 os
-# from oslo_config import cfg
-from oslo_log import log as logging
-# from moon_utilities import options # noqa
-from moon_consul.http_server import HTTPServer
-
-LOG = logging.getLogger(__name__)
-# CONF = cfg.CONF
-# DOMAIN = "moon_consul"
-
-# __CWD__ = os.path.dirname(os.path.abspath(__file__))
-
-
-class Configuration:
- DB_URL = None
- DB_DRIVER = None
- TRANSPORT_URL = None
- DOCKER_URL = None
- SLAVE_NAME = None
- MASTER_URL = None
- MASTER_LOGIN = None
- MASTER_PASSWORD = None
- INTERFACE_PORT = None
- CONSUL_HOST = None
- CONSUL_PORT = None
- KEYSTONE_URL = None
- KEYSTONE_USER = None
- KEYSTONE_PASSWORD = None
- KEYSTONE_DOMAIN = None
- KEYSTONE_PROJECT = None
- KEYSTONE_CHECK_TOKEN = None
- KEYSTONE_SERVER_CRT = None
- PLUGIN_CONTAINERS = None
-
-
-def get_configuration():
- conf = Configuration()
- conf.DB_URL = os.getenv("DB_URL", "mysql+pymysql://moon:p4sswOrd1@db/moon")
- conf.DB_DRIVER = os.getenv("DB_DRIVER", "sql")
- conf.TRANSPORT_URL = os.getenv("TRANSPORT_URL", "rabbit://moon:p4sswOrd1@messenger:5672/moon")
- conf.DOCKER_URL = os.getenv("DOCKER_URL", "unix://var/run/docker.sock")
- conf.SLAVE_NAME = os.getenv("SLAVE_NAME", "")
- conf.MASTER_URL = os.getenv("MASTER_URL", "")
- conf.MASTER_LOGIN = os.getenv("MASTER_LOGIN", "")
- conf.MASTER_PASSWORD = os.getenv("MASTER_PASSWORD", "")
- conf.INTERFACE_PORT = os.getenv("INTERFACE_PORT", "8080")
- conf.CONSUL_HOST = os.getenv("CONSUL_HOST", "172.88.88.88")
- conf.CONSUL_PORT = os.getenv("CONSUL_PORT", "88")
- conf.KEYSTONE_URL = os.getenv("KEYSTONE_URL", "http://keystone:5000/v3")
- conf.KEYSTONE_USER = os.getenv("KEYSTONE_USER", "admin")
- conf.KEYSTONE_PASSWORD = os.getenv("KEYSTONE_PASSWORD", "p4ssw0rd")
- conf.KEYSTONE_DOMAIN = os.getenv("KEYSTONE_DOMAIN", "default")
- conf.KEYSTONE_PROJECT = os.getenv("KEYSTONE_PROJECT", "admin")
- conf.KEYSTONE_CHECK_TOKEN = os.getenv("KEYSTONE_CHECK_TOKEN", False)
- conf.KEYSTONE_SERVER_CRT = os.getenv("KEYSTONE_SERVER_CRT", False)
- conf.PLUGIN_CONTAINERS = os.getenv("PLUGIN_CONTAINERS", "asteroide/authz:latest,asteroide/session:latest")
- conf.COMPONENTS_PORT_START = int(os.getenv("COMPONENTS_PORT_START", "38001"))
- conf.COMPONENTS = [
- {
- "hostname": conf.CONSUL_HOST,
- "port": conf.CONSUL_PORT,
- "id": "consul",
- "keystone_id": None
- },
- ]
- return conf
-
-
-def main():
- conf = get_configuration()
- LOG.info("Starting server with IP {} on port {}".format(conf.CONSUL_HOST, conf.CONSUL_PORT))
- server = HTTPServer(host=conf.CONSUL_HOST, port=int(conf.CONSUL_PORT), conf=conf)
- server.run()
-
-
-if __name__ == '__main__':
- main()
diff --git a/moonv4/moon_consul/requirements.txt b/moonv4/moon_consul/requirements.txt
deleted file mode 100644
index ab99edaa..00000000
--- a/moonv4/moon_consul/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-oslo.messaging
-flask
-flask_restful
-flask_cors
-moon_utilities \ No newline at end of file
diff --git a/moonv4/moon_consul/setup.py b/moonv4/moon_consul/setup.py
deleted file mode 100644
index d4aac83c..00000000
--- a/moonv4/moon_consul/setup.py
+++ /dev/null
@@ -1,50 +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'.
-
-from setuptools import setup, find_packages
-import moon_consul
-
-
-with open('requirements.txt') as f:
- required = f.read().splitlines()
-
-setup(
-
- name='moon_consul',
-
- version=moon_consul.__version__,
-
- packages=find_packages(),
-
- author="Thomas Duval",
-
- author_email="thomas.duval@orange.com",
-
- description="This component is a helper to retrieve configuration across the Moon platform.",
-
- long_description=open('README.md').read(),
-
- install_requires=required,
-
- include_package_data=True,
-
- url='https://git.opnfv.org/cgit/moon/',
-
- classifiers=[
- "Programming Language :: Python",
- "Development Status :: 1 - Planning",
- "License :: OSI Approved",
- "Natural Language :: English",
- "Operating System :: OS Independent",
- "Programming Language :: Python :: 3",
- ],
-
- entry_points={
- 'console_scripts': [
- 'moon_consul = moon_consul.server:run',
- ],
- }
-
-)
diff --git a/moonv4/moon_router/Dockerfile b/moonv4/moon_router/Dockerfile
deleted file mode 100644
index 1722b801..00000000
--- a/moonv4/moon_router/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt update && apt install python3.5 python3-pip -y
-RUN pip3 install pip --upgrade
-
-ADD . /root
-WORKDIR /root/
-RUN pip3 install -r requirements.txt --upgrade
-RUN pip3 install .
-
-CMD ["python3", "-m", "moon_router"] \ No newline at end of file
diff --git a/moonv4/moon_router/LICENSE b/moonv4/moon_router/LICENSE
deleted file mode 100644
index 4143aac2..00000000
--- a/moonv4/moon_router/LICENSE
+++ /dev/null
@@ -1,204 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
---- License for python-keystoneclient versions prior to 2.1 ---
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of this project nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/moonv4/moon_router/MANIFEST.in b/moonv4/moon_router/MANIFEST.in
deleted file mode 100644
index 1f674d50..00000000
--- a/moonv4/moon_router/MANIFEST.in
+++ /dev/null
@@ -1,9 +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'.
-
-include README.rst
-include LICENSE
-include setup.py
-include requirements.txt
diff --git a/moonv4/moon_router/README.md b/moonv4/moon_router/README.md
deleted file mode 100644
index 91899b31..00000000
--- a/moonv4/moon_router/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Router: Core module for the Moon project
-
-This package contains the core module for the Moon project
-It is designed to provide authorization features to all OpenStack components.
-
-For any other information, refer to the parent project:
-
- https://git.opnfv.org/moon
-
-## Build Image
-```bash
-docker image build -t wukongsun/moon_router:v4.1 .
-```
-
-## Push Image
-```bash
-docker push wukongsun/moon_router:v4.1
-``` \ No newline at end of file
diff --git a/moonv4/moon_router/doc/api-moon-secrouter.pdf b/moonv4/moon_router/doc/api-moon-secrouter.pdf
deleted file mode 100644
index 9ba75db0..00000000
--- a/moonv4/moon_router/doc/api-moon-secrouter.pdf
+++ /dev/null
Binary files differ
diff --git a/moonv4/moon_router/doc/api.pdf b/moonv4/moon_router/doc/api.pdf
deleted file mode 100644
index b7d91293..00000000
--- a/moonv4/moon_router/doc/api.pdf
+++ /dev/null
Binary files differ
diff --git a/moonv4/moon_router/moon_router/__init__.py b/moonv4/moon_router/moon_router/__init__.py
deleted file mode 100644
index 903c6518..00000000
--- a/moonv4/moon_router/moon_router/__init__.py
+++ /dev/null
@@ -1,6 +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'.
-
-__version__ = "0.1.0"
diff --git a/moonv4/moon_router/moon_router/__main__.py b/moonv4/moon_router/moon_router/__main__.py
deleted file mode 100644
index 0d7a8fe6..00000000
--- a/moonv4/moon_router/moon_router/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from moon_router.server import main
-
-main()
diff --git a/moonv4/moon_router/moon_router/api/__init__.py b/moonv4/moon_router/moon_router/api/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/moonv4/moon_router/moon_router/api/__init__.py
+++ /dev/null
diff --git a/moonv4/moon_router/moon_router/api/generic.py b/moonv4/moon_router/moon_router/api/generic.py
deleted file mode 100644
index d066f715..00000000
--- a/moonv4/moon_router/moon_router/api/generic.py
+++ /dev/null
@@ -1,46 +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'.
-from moon_utilities.security_functions import call
-
-
-class Status(object):
- """
- Retrieve the current status of all components.
- """
-
- __version__ = "0.1.0"
-
- def __get_status(self, ctx, args={}):
- return {"status": "Running"}
-
- def get_status(self, ctx, args={}):
- status = dict()
- if "component_id" in ctx and ctx["component_id"] == "security_router":
- return {"security_router": self.__get_status(ctx, args)}
- elif "component_id" in ctx and ctx["component_id"]:
- # TODO (dthom): check if component exist
- status[ctx["component_id"]] = call(ctx["component_id"], ctx, "get_status", args=args)
- else:
- # TODO (dthom): must get the status of all containers
- status["orchestrator"] = call("orchestrator", ctx, "get_status", args=args)
- status["security_router"] = self.__get_status(ctx, args)
- return status
-
-
-class Logs(object):
- """
- Retrieve the current status of all components.
- """
-
- __version__ = "0.1.0"
-
- def get_logs(self, ctx, args={}):
- logs = dict()
- logs["orchestrator"] = call("orchestrator", ctx, "get_logs", args=args)
- # TODO (dthom): must get the logs of all containers
- logs["security_router"] = {"error": "Not implemented", "ctx": ctx, "args": args}
- return logs
-
-
diff --git a/moonv4/moon_router/moon_router/api/route.py b/moonv4/moon_router/moon_router/api/route.py
deleted file mode 100644
index c9cfb82a..00000000
--- a/moonv4/moon_router/moon_router/api/route.py
+++ /dev/null
@@ -1,472 +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 copy
-import time
-import itertools
-from uuid import uuid4
-from oslo_log import log as logging
-from moon_utilities.security_functions import call, notify
-from moon_router.api.generic import Status, Logs
-from moon_utilities import configuration
-
-LOG = logging.getLogger("moon.router.api.route")
-
-API = {
- "orchestrator": (
- "add_container",
- "delete_container",
- "add_slave",
- "get_slaves",
- "delete_slave"
- ),
- # TODO (asteroide): need to check if some of those calls need (or not) to be called "update_"
- "manager": (
- "get_subject_assignments",
- "set_subject_assignment",
- "delete_subject_assignment",
- "get_object_assignments",
- "set_object_assignment",
- "delete_object_assignment",
- "get_action_assignments",
- "set_action_assignment",
- "delete_action_assignment",
- "get_subject_data",
- "add_subject_data",
- "delete_subject_data",
- "get_object_data",
- "add_object_data",
- "delete_object_data",
- "get_action_data",
- "add_action_data",
- "delete_action_data",
- "get_subject_categories",
- "set_subject_category",
- "delete_subject_category",
- "get_object_categories",
- "set_object_category",
- "delete_object_category",
- "get_action_categories",
- "set_action_category",
- "delete_action_category",
- "add_meta_rules",
- "delete_meta_rules",
- "get_meta_rules",
- "set_meta_rules",
- "get_models",
- "add_model",
- "delete_model",
- "update_model",
- "get_pdp",
- "add_pdp",
- "delete_pdp",
- "update_pdp",
- "get_subjects",
- "set_subject",
- "delete_subject",
- "get_objects",
- "set_object",
- "delete_object",
- "get_actions",
- "set_action",
- "delete_action",
- "get_policies",
- "add_policy",
- "delete_policy",
- "update_policy",
- "get_subject_assignments",
- "update_subject_assignment",
- "delete_subject_assignment",
- "get_object_assignments",
- "update_object_assignment",
- "delete_object_assignment",
- "get_action_assignments",
- "update_action_assignment",
- "delete_action_assignment",
- "get_rules",
- "add_rule",
- "delete_rule",
- "update_from_master"
- ),
- "function": (
- "authz",
- "return_authz",
- ),
-}
-
-
-class Cache(object):
-
- # TODO (asteroide): set cache integer in CONF file
- __UPDATE_INTERVAL = 10
-
- __CONTAINERS = {}
- __CONTAINERS_UPDATE = 0
-
- __CONTAINER_CHAINING_UPDATE = 0
- __CONTAINER_CHAINING = {}
-
- __PDP = {}
- __PDP_UPDATE = 0
-
- __POLICIES = {}
- __POLICIES_UPDATE = 0
-
- __MODELS = {}
- __MODELS_UPDATE = 0
-
- __AUTHZ_REQUESTS = {}
-
- def update(self, component=None):
- self.__update_container()
- self.__update_pdp()
- self.__update_policies()
- self.__update_models()
- for key, value in self.__PDP.items():
- LOG.info("Updating container_chaining with {}".format(value["keystone_project_id"]))
- self.__update_container_chaining(value["keystone_project_id"])
-
- @property
- def authz_requests(self):
- return self.__AUTHZ_REQUESTS
-
- def __update_pdp(self):
- pdp = call("moon_manager", method="get_pdp", ctx={"user_id": "admin"}, args={})
- if not pdp["pdps"]:
- LOG.info("Updating PDP through master")
- pdp = call("moon_manager", method="get_pdp",
- ctx={
- "user_id": "admin",
- 'call_master': True
- },
- args={})
- for _pdp in pdp["pdps"].values():
- if _pdp['keystone_project_id'] not in self.__CONTAINER_CHAINING:
- self.__CONTAINER_CHAINING[_pdp['keystone_project_id']] = {}
- # Note (asteroide): force update of chaining
- self.__update_container_chaining(_pdp['keystone_project_id'])
- for key, value in pdp["pdps"].items():
- self.__PDP[key] = value
-
- @property
- def pdp(self):
- current_time = time.time()
- if self.__PDP_UPDATE + self.__UPDATE_INTERVAL < current_time:
- self.__update_pdp()
- self.__PDP_UPDATE = current_time
- return self.__PDP
-
- def __update_policies(self):
- policies = call("moon_manager", method="get_policies", ctx={"user_id": "admin"}, args={})
- for key, value in policies["policies"].items():
- self.__POLICIES[key] = value
-
- @property
- def policies(self):
- current_time = time.time()
- if self.__POLICIES_UPDATE + self.__UPDATE_INTERVAL < current_time:
- self.__update_policies()
- self.__POLICIES_UPDATE = current_time
- return self.__POLICIES
-
- def __update_models(self):
- models = call("moon_manager", method="get_models", ctx={"user_id": "admin"}, args={})
- for key, value in models["models"].items():
- self.__MODELS[key] = value
-
- @property
- def models(self):
- current_time = time.time()
- if self.__MODELS_UPDATE + self.__UPDATE_INTERVAL < current_time:
- self.__update_models()
- self.__MODELS_UPDATE = current_time
- return self.__MODELS
-
- def __update_container(self):
- containers = call("orchestrator", method="get_container", ctx={}, args={})
- for key, value in containers["containers"].items():
- self.__CONTAINERS[key] = value
-
- @property
- def container_chaining(self):
- current_time = time.time()
- if self.__CONTAINER_CHAINING_UPDATE + self.__UPDATE_INTERVAL < current_time:
- for key, value in self.pdp.items():
- self.__update_container_chaining(value["keystone_project_id"])
- self.__CONTAINER_CHAINING_UPDATE = current_time
- return self.__CONTAINER_CHAINING
-
- def __update_container_chaining(self, keystone_project_id):
- container_ids = []
- for pdp_id, pdp_value, in CACHE.pdp.items():
- LOG.info("pdp_id, pdp_value = {}, {}".format(pdp_id, pdp_value))
- if pdp_value:
- if pdp_value["keystone_project_id"] == keystone_project_id:
- for policy_id in pdp_value["security_pipeline"]:
- model_id = CACHE.policies[policy_id]['model_id']
- LOG.info("model_id = {}".format(model_id))
- LOG.info("CACHE = {}".format(CACHE.models[model_id]))
- for meta_rule_id in CACHE.models[model_id]["meta_rules"]:
- LOG.info("CACHE.containers = {}".format(CACHE.containers))
- for container_id, container_values, in CACHE.containers.items():
- LOG.info("container_id, container_values = {}".format(container_id, container_values))
- for container_value in container_values:
- LOG.info("container_value[\"meta_rule_id\"] == meta_rule_id = {} {}".format(container_value["meta_rule_id"], meta_rule_id))
- if container_value["meta_rule_id"] == meta_rule_id:
- container_ids.append(
- {
- "container_id": container_value["container_id"],
- "genre": container_value["genre"]
- }
- )
- break
- self.__CONTAINER_CHAINING[keystone_project_id] = container_ids
-
- @property
- def containers(self):
- """intra_extensions cache
- example of content :
- {
- "pdp_uuid1": "component_uuid1",
- "pdp_uuid2": "component_uuid2",
- }
- :return:
- """
- current_time = time.time()
- if self.__CONTAINERS_UPDATE + self.__UPDATE_INTERVAL < current_time:
- self.__update_container()
- self.__CONTAINERS_UPDATE = current_time
- return self.__CONTAINERS
-
-
-CACHE = Cache()
-
-
-class AuthzRequest:
-
- result = None
- req_max_delay = 2
-
- def __init__(self, ctx, args):
- self.ctx = ctx
- self.args = args
- self.request_id = ctx["request_id"]
- if self.ctx['id'] not in CACHE.container_chaining:
- LOG.warning("Unknown Project ID {}".format(self.ctx['id']))
- # TODO (asteroide): add a better exception handler
- raise Exception("Unknown Project ID {}".format(self.ctx['id']))
- self.container_chaining = CACHE.container_chaining[self.ctx['id']]
- ctx["container_chaining"] = copy.deepcopy(self.container_chaining)
- LOG.info("self.container_chaining={}".format(self.container_chaining))
- self.pdp_container = self.container_chaining[0]["container_id"]
- self.run()
-
- def run(self):
- notify(request_id=self.request_id, container_id=self.pdp_container, payload=self.ctx)
- cpt = 0
- while cpt < self.req_max_delay*10:
- time.sleep(0.1)
- cpt += 1
- if CACHE.authz_requests[self.request_id]:
- self.result = CACHE.authz_requests[self.request_id]
- return
- LOG.warning("Request {} has timed out".format(self.request_id))
-
- def is_authz(self):
- if not self.result:
- return False
- authz_results = []
- for key in self.result["pdp_set"]:
- if "effect" in self.result["pdp_set"][key]:
- if self.result["pdp_set"][key]["effect"] == "grant":
- # the pdp is a authorization PDP and grant the request
- authz_results.append(True)
- elif self.result["pdp_set"][key]["effect"] == "passed":
- # the pdp is not a authorization PDP (session or delegation) and had run normally
- authz_results.append(True)
- elif self.result["pdp_set"][key]["effect"] == "unset":
- # the pdp is not a authorization PDP (session or delegation) and had not yep run
- authz_results.append(True)
- else:
- # the pdp is (or not) a authorization PDP and had run badly
- authz_results.append(False)
- if list(itertools.accumulate(authz_results, lambda x, y: x & y))[-1]:
- self.result["pdp_set"]["effect"] = "grant"
- if self.result:
- if "pdp_set" in self.result and self.result["pdp_set"]["effect"] == "grant":
- return True
- return False
-
-
-class Router(object):
- """
- Route requests to all components.
- """
-
- __version__ = "0.1.0"
- cache_requests = {}
- slave_name = ""
-
- def __init__(self, add_master_cnx):
- self.slave = configuration.get_configuration(configuration.SLAVE)["slave"]
- try:
- self.slave_name = self.slave['name']
- except KeyError:
- pass
- if self.slave_name and add_master_cnx:
- result = call('security_router', method="route",
- ctx={
- "name": self.slave_name,
- "description": self.slave_name,
- "call_master": True,
- "method": "add_slave"}, args={})
- if "result" in result and not result["result"]:
- LOG.error("An error occurred when sending slave name {} {}".format(
- self.slave_name, result
- ))
- self.slave_id = list(result['slaves'].keys())[0]
- result = call('security_router', method="route",
- ctx={
- "name": self.slave_name,
- "description": self.slave_name,
- "call_master": True,
- "method": "get_slaves"}, args={})
- if "result" in result and not result["result"]:
- LOG.error("An error occurred when receiving slave names {} {}".format(
- self.slave_name, result
- ))
- LOG.info("SLAVES: {}".format(result))
-
- def delete(self):
- if self.slave_name and self.slave_id:
- result = call('security_router', method="route",
- ctx={
- "name": self.slave_name,
- "description": self.slave_name,
- "call_master": True,
- "method": "delete_slave",
- "id": self.slave_id}, args={})
- if "result" in result and not result["result"]:
- LOG.error("An error occurred when sending slave name {} {}".format(
- self.slave_name, result
- ))
- LOG.info("SLAVE CONNECTION ENDED!")
- LOG.info(result)
-
- def check_pdp(self, ctx):
- _ctx = copy.deepcopy(ctx)
- keystone_id = _ctx.pop('id')
- # LOG.info("_ctx {}".format(_ctx))
- ext = call("moon_manager", method="get_pdp", ctx=_ctx, args={})
- # LOG.info("check_pdp {}".format(ext))
- if "error" in ext:
- return False
- keystone_id_list = map(lambda x: x["keystone_project_id"], ext['pdps'].values())
- if not ext['pdps'] or keystone_id not in keystone_id_list:
- if self.slave_name:
- _ctx['call_master'] = True
- # update from master if exist and test again
- LOG.info("Need to update from master {}".format(keystone_id))
- ext = call("moon_manager", method="get_pdp", ctx=_ctx, args={})
- if "error" in ext:
- return False
- keystone_id_list = map(lambda x: x["keystone_project_id"], ext['pdps'].values())
- if not ext['pdps'] or keystone_id not in keystone_id_list:
- return False
- else:
- # Must update from Master
- _ctx["keystone_id"] = keystone_id
- _ctx["pdp_id"] = None
- _ctx["security_pipeline"] = None
- _ctx['call_master'] = False
- pdp_value = {}
- for pdp_id, pdp_value in ext["pdps"].items():
- if keystone_id == pdp_value["keystone_project_id"]:
- _ctx["pdp_id"] = keystone_id
- _ctx["security_pipeline"] = pdp_value["security_pipeline"]
- break
- call("moon_manager", method="update_from_master", ctx=_ctx, args=pdp_value)
- CACHE.update()
- return True
- else:
- # return False otherwise
- return False
- return True
-
- def send_update(self, api, ctx={}, args={}):
- # TODO (asteroide): add threads here
- if not self.slave_name:
- # Note (asteroide):
- # if adding or setting an element: do nothing
- # if updating or deleting an element: force deletion in the slave
- if "update_" in api or "delete_" in api:
- for slave_id, slave_dict in call("orchestrator", method="get_slaves", ctx={}, args={})['slaves'].items():
- LOG.info('send_update slave_id={}'.format(slave_id))
- LOG.info('send_update slave_dict={}'.format(slave_dict))
- ctx['method'] = api.replace("update", "delete")
- # TODO (asteroide): force data_id to None to force the deletion in the slave
- result = call("security_router_"+slave_dict['name'], method="route", ctx=ctx, args=args)
- if "result" in result and not result["result"]:
- LOG.error("An error occurred when sending update to {} {}".format(
- "security_router_"+slave_dict['name'], result
- ))
-
- def route(self, ctx, args):
- """Route the request to the right endpoint
-
- :param ctx: dictionary depending of the real destination
- :param args: dictionary depending of the real destination
- :return: dictionary depending of the real destination
- """
- LOG.info("Get Route {} {}".format(ctx, args))
- if ctx["method"] == "get_status":
- return Status().get_status(ctx=ctx, args=args)
- if ctx["method"] == "get_logs":
- return Logs().get_logs(ctx=ctx, args=args)
- for component in API:
- if ctx["method"] in API[component]:
- if component == "orchestrator":
- return call(component, method=ctx["method"], ctx=ctx, args=args)
- if component == "manager":
- result = call("moon_manager", method=ctx["method"], ctx=ctx, args=args)
- if ctx["method"] == "get_pdp":
- _ctx = copy.deepcopy(ctx)
- _ctx["call_master"] = True
- result2 = call("moon_manager", method=ctx["method"], ctx=_ctx, args=args)
- result["pdps"].update(result2["pdps"])
- self.send_update(api=ctx["method"], ctx=ctx, args=args)
- return result
- if component == "function":
- if ctx["method"] == "return_authz":
- request_id = ctx["request_id"]
- CACHE.authz_requests[request_id] = args
- return args
- elif self.check_pdp(ctx):
- req_id = uuid4().hex
- CACHE.authz_requests[req_id] = {}
- ctx["request_id"] = req_id
- req = AuthzRequest(ctx, args)
- # result = copy.deepcopy(req.result)
- if req.is_authz():
- return {"authz": True,
- "pdp_id": ctx["id"],
- "ctx": ctx, "args": args}
- return {"authz": False,
- "error": {'code': 403, 'title': 'Authz Error',
- 'description': "The authz request is refused."},
- "pdp_id": ctx["id"],
- "ctx": ctx, "args": args}
- return {"result": False,
- "error": {'code': 500, 'title': 'Moon Error',
- 'description': "Function component not found."},
- "pdp_id": ctx["id"],
- "ctx": ctx, "args": args}
-
- # TODO (asteroide): must raise an exception here ?
- return {"result": False,
- "error": {'code': 500, 'title': 'Moon Error', 'description': "Endpoint method not found."},
- "intra_extension_id": ctx["id"],
- "ctx": ctx, "args": args}
-
diff --git a/moonv4/moon_router/moon_router/messenger.py b/moonv4/moon_router/moon_router/messenger.py
deleted file mode 100644
index 0a377678..00000000
--- a/moonv4/moon_router/moon_router/messenger.py
+++ /dev/null
@@ -1,69 +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'.
-
-from oslo_config import cfg
-import oslo_messaging
-import time
-from oslo_log import log as logging
-from moon_router.api.generic import Status, Logs
-from moon_router.api.route import Router
-from moon_utilities.api import APIList
-from moon_utilities import configuration
-
-LOG = logging.getLogger("moon.router.messenger")
-
-
-class Server:
-
- TOPIC = "security_router"
-
- def __init__(self, add_master_cnx=False):
- slave = configuration.get_configuration(configuration.SLAVE)["slave"]
- cfg.CONF.transport_url = self.__get_transport_url()
- if add_master_cnx and slave["master"]["url"]:
- self.transport = oslo_messaging.get_transport(cfg.CONF, slave["master"]["url"])
- self.TOPIC = self.TOPIC + "_" + slave["name"]
- else:
- self.transport = oslo_messaging.get_transport(cfg.CONF)
- self.target = oslo_messaging.Target(topic=self.TOPIC, server='server1')
- LOG.info("Starting MQ server with topic: {}".format(self.TOPIC))
- self.endpoints = [
- APIList((Status, Logs, Router)),
- Status(),
- Logs(),
- Router(add_master_cnx)
- ]
- self.server = oslo_messaging.get_rpc_server(self.transport, self.target, self.endpoints,
- executor='threading',
- access_policy=oslo_messaging.DefaultRPCAccessPolicy)
- self.__is_alive = False
-
- @staticmethod
- def __get_transport_url():
- messenger = configuration.get_configuration(configuration.MESSENGER)["messenger"]
- return messenger['url']
-
- def stop(self):
- self.__is_alive = False
- self.endpoints[-1].delete()
-
- def run(self):
- try:
- self.__is_alive = True
- self.server.start()
- while True:
- if self.__is_alive:
- time.sleep(1)
- else:
- break
- except KeyboardInterrupt:
- print("Stopping server by crtl+c")
- except SystemExit:
- print("Stopping server with SystemExit")
- print("Stopping server")
-
- self.server.stop()
- self.server.wait()
-
diff --git a/moonv4/moon_router/moon_router/server.py b/moonv4/moon_router/moon_router/server.py
deleted file mode 100644
index 1b2bddee..00000000
--- a/moonv4/moon_router/moon_router/server.py
+++ /dev/null
@@ -1,63 +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 os
-import threading
-import signal
-from oslo_log import log as logging
-from moon_utilities import configuration, exceptions
-from moon_router.messenger import Server
-
-
-class AsyncServer(threading.Thread):
-
- def __init__(self, add_master_cnx):
- threading.Thread.__init__(self)
- self.server = Server(add_master_cnx=add_master_cnx)
-
- def run(self):
- self.server.run()
-
-LOG = logging.getLogger("moon.router")
-
-__CWD__ = os.path.dirname(os.path.abspath(__file__))
-
-background_threads = []
-
-
-def stop_thread():
- for _t in background_threads:
- _t.stop()
-
-
-def main():
- global background_threads
- configuration.init_logging()
- try:
- conf = configuration.get_configuration("components/router")
- except exceptions.ConsulComponentNotFound:
- conf = configuration.add_component("router", "router")
- signal.signal(signal.SIGALRM, stop_thread)
- signal.signal(signal.SIGTERM, stop_thread)
- signal.signal(signal.SIGABRT, stop_thread)
- background_master = None
- slave = configuration.get_configuration(configuration.SLAVE)["slave"]
- if slave['name']:
- background_master = AsyncServer(add_master_cnx=True)
- background_threads.append(background_master)
- background_slave = AsyncServer(add_master_cnx=False)
- background_threads.append(background_slave)
- if slave['name']:
- background_master.start()
- LOG.info("Connecting to master...")
- background_slave.start()
- LOG.info("Starting main server {}".format(conf["components/router"]["hostname"]))
- if slave['name']:
- background_master.join()
- background_slave.join()
-
-
-if __name__ == '__main__':
- main()
diff --git a/moonv4/moon_router/requirements.txt b/moonv4/moon_router/requirements.txt
deleted file mode 100644
index 9eb4e201..00000000
--- a/moonv4/moon_router/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-kombu !=4.0.1,!=4.0.0
-oslo.messaging
-oslo.config
-vine
-oslo.log
-babel
-moon_utilities \ No newline at end of file
diff --git a/moonv4/moon_router/setup.py b/moonv4/moon_router/setup.py
deleted file mode 100644
index aabe8349..00000000
--- a/moonv4/moon_router/setup.py
+++ /dev/null
@@ -1,46 +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'.
-
-from setuptools import setup, find_packages
-import moon_router
-
-
-setup(
-
- name='moon_router',
-
- version=moon_router.__version__,
-
- packages=find_packages(),
-
- author="Thomas Duval",
-
- author_email="thomas.duval@orange.com",
-
- description="",
-
- long_description=open('README.md').read(),
-
- # install_requires= ,
-
- include_package_data=True,
-
- url='https://git.opnfv.org/cgit/moon',
-
- classifiers=[
- "Programming Language :: Python",
- "Development Status :: 1 - Planning",
- "License :: OSI Approved",
- "Natural Language :: French",
- "Operating System :: OS Independent",
- "Programming Language :: Python :: 3",
- ],
-
- entry_points={
- 'console_scripts': [
- 'moon_router = moon_router.server:main',
- ],
- }
-)
diff --git a/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz
deleted file mode 100644
index 14df1d47..00000000
--- a/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz
+++ /dev/null
Binary files differ
diff --git a/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz
deleted file mode 100644
index d3246532..00000000
--- a/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz
+++ /dev/null
Binary files differ