COPY ./models /resources/models
COPY ./scripts ./scripts
COPY ./src/python/netconf_server ./application/netconf_server
-COPY ./src/python/netconf_server_application.py ./application/netconf_server_application.py
+COPY src/python/netconf_change_listener_application.py ./application/netconf_change_listener_application.py
+COPY ./src/python/netconf_rest_application.py ./application/netconf_rest_application.py
COPY ./src/python/requirements.txt ./application/requirements.txt
COPY ./src/python/setup.py ./application/setup.py
if [ "$#" -eq 2 ]; then
- echo "Starting NETCONF server"
- python3 ./application/netconf_server_application.py $1/$2 &
+ ## Set up variable
+ MODELS_CONFIG_PATH=$1
+ MODELS_CONFIG_NAME=$2
+
+ echo "Starting NETCONF Change listener"
+ python3 ./application/netconf_change_listener_application.py $MODELS_CONFIG_PATH/$MODELS_CONFIG_NAME &
+
+
+ echo "Starting NETCONF Rest server"
+ python3 ./application/netconf_rest_application.py $MODELS_CONFIG_PATH/$MODELS_CONFIG_NAME &
+
else
- echo "Missing argument: path to file with models to subscribe to."
+ echo "[ERROR] Invalid number of arguments. Please provide all required arguments."
fi
# limitations under the License.
# ============LICENSE_END=========================================================
###
+import asyncio
import sys
import logging
from netconf_server.netconf_rest_server import NetconfRestServer
+from netconf_server.sysrepo_configuration.sysrepo_configuration_manager import SysrepoConfigurationManager
from netconf_server.netconf_change_listener import NetconfChangeListener
from netconf_server.netconf_change_listener_factory import NetconfChangeListenerFactory
from netconf_server.sysrepo_interface.sysrepo_client import SysrepoClient
logging.basicConfig(
- handlers=[logging.StreamHandler(), logging.FileHandler("/logs/netconf_server.log")],
+ handlers=[logging.StreamHandler(), logging.FileHandler("/logs/netconf_change_listener.log")],
level=logging.DEBUG
)
-logger = logging.getLogger("netconf_server")
+logger = logging.getLogger("netconf_change_listener")
-def run_server_forever(session, change_listener: NetconfChangeListener, server_rest: NetconfRestServer):
+def run_server_forever(session, connection, change_listener: NetconfChangeListener):
change_listener.run(session)
- server_rest.start()
+ asyncio.get_event_loop().run_forever()
def create_change_listener() -> NetconfChangeListener:
return NetconfChangeListenerFactory(configuration.models_to_subscribe_to).create()
-def create_rest_server() -> NetconfRestServer:
- return NetconfRestServer()
-
-
if __name__ == "__main__":
if len(sys.argv) >= 2:
try:
netconf_change_listener = create_change_listener()
- rest_server = create_rest_server()
- SysrepoClient().run_in_session(run_server_forever, netconf_change_listener, rest_server)
+ SysrepoClient().run_in_session(run_server_forever, netconf_change_listener)
except ConfigLoadingException:
logger.error("File to load configuration from file %s" % sys.argv[1])
else:
--- /dev/null
+###
+# ============LICENSE_START=======================================================
+# Netconf Server
+# ================================================================================
+# Copyright (C) 2021 Nokia. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+import sys
+import logging
+from netconf_server.netconf_rest_server import NetconfRestServer
+from netconf_server.sysrepo_configuration.sysrepo_configuration_manager import SysrepoConfigurationManager
+
+from netconf_server.sysrepo_configuration.sysrepo_configuration_loader import ConfigLoadingException
+from netconf_server.sysrepo_interface.sysrepo_client import SysrepoClient
+
+logging.basicConfig(
+ handlers=[logging.StreamHandler(), logging.FileHandler("/logs/netconf_rest_application.log")],
+ level=logging.DEBUG
+)
+logger = logging.getLogger("netconf_rest_application")
+
+
+def start_rest_server(session, connection, server_rest: NetconfRestServer):
+ sysrepo_cfg_manager = create_conf_manager(session, connection)
+ server_rest.start(sysrepo_cfg_manager)
+
+
+def create_rest_server() -> NetconfRestServer:
+ return NetconfRestServer()
+
+
+def create_conf_manager(session, connection) -> SysrepoConfigurationManager:
+ return SysrepoConfigurationManager(session, connection)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) >= 2:
+ rest_server = create_rest_server()
+ SysrepoClient().run_in_session(start_rest_server, rest_server)
+ else:
+ logger.error("Missing path to file with configuration argument required to start netconf server.")
from netconf_server.sysrepo_interface.config_change_data import ConfigChangeData
-logger = logging.getLogger("netconf_saver")
+logger = logging.getLogger(__name__)
class NetconfChangeListener(object):
from netconf_server.netconf_change_listener import NetconfChangeListener
from netconf_server.sysrepo_interface.config_change_subscriber import ConfigChangeSubscriber
-logger = logging.getLogger("netconf_saver")
+logger = logging.getLogger(__name__)
class NetconfChangeListenerFactory(object):
###
import logging as sys_logging
-from flask import Flask, logging, make_response, Response
+from flask import Flask, logging, make_response, Response, request
+from netconf_server.sysrepo_configuration.sysrepo_configuration_manager import SysrepoConfigurationManager
class NetconfRestServer:
_rest_server: Flask = Flask("server")
- sys_logging.basicConfig(level=sys_logging.DEBUG)
logger = logging.create_logger(_rest_server)
+ _configuration_manager: SysrepoConfigurationManager
def __init__(self, host='0.0.0.0', port=6555):
self._host = host
self._port = port
- def start(self):
+ def start(self, configuration_manager: SysrepoConfigurationManager):
+ NetconfRestServer._configuration_manager = configuration_manager
Flask.run(
NetconfRestServer._rest_server,
host=self._host,
def __health_check():
return "UP"
+ @staticmethod
+ @_rest_server.route("/change_config/<path:module_name>", methods=['POST'])
+ def __change_config(module_name):
+ config_data = request.data.decode("utf-8")
+ NetconfRestServer._configuration_manager.change_configuration(config_data, module_name)
+ return NetconfRestServer.__create_http_response(202, "Accepted")
+
@staticmethod
def __create_http_response(code, message):
return make_response(
--- /dev/null
+# ================================================================================
+# Copyright (C) 2021 Nokia. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+import logging
+
+
+class SysrepoConfigurationManager(object):
+ logger = logging.getLogger(__name__)
+
+ def __init__(self, session, connection):
+ self._connection = connection
+ self._session = session
+
+ def __parse_config_data(self, config_data):
+ self.logger.debug(config_data)
+ ctx = self._connection.get_ly_ctx()
+ data = ctx.parse_data_mem(
+ config_data,
+ "xml",
+ config=True,
+ strict=False,
+ )
+ return data
+
+ def change_configuration(self, config_data: str, module_name: str):
+ data = self.__parse_config_data(config_data)
+ self._session.replace_config_ly(data, module_name)
def run_in_session(method_to_run: callable, *extra_args):
with sysrepo.SysrepoConnection() as connection:
with connection.start_session() as session:
- method_to_run(session, *extra_args)
+ method_to_run(session, connection, *extra_args)
--- /dev/null
+import unittest
+from unittest.mock import MagicMock
+from netconf_server.sysrepo_configuration.sysrepo_configuration_manager import SysrepoConfigurationManager
+
+
+class TestSysrepoConfigurationManager(unittest.TestCase):
+
+ def test_should_change_configuration(self):
+ # given
+ expected_parse_data = "parse_data"
+
+ ctx = MagicMock()
+ ctx.parse_data_mem = MagicMock(return_value=expected_parse_data)
+ connection = MagicMock()
+ connection.get_ly_ctx = MagicMock(return_value=ctx)
+ session = MagicMock()
+ session.replace_config_ly = MagicMock()
+
+ config_data = '''<config xmlns="http://onap.org/pnf-simulator">
+ <itemValue1>12</itemValue1>
+ <itemValue2>12</itemValue2>
+ </config>'''
+ module_name = "pnf-simulator"
+
+ # when
+ config_manager = SysrepoConfigurationManager(session=session, connection=connection)
+ config_manager.change_configuration(config_data=config_data, module_name=module_name)
+
+ # then
+ ctx.parse_data_mem.assert_called_with(config_data, "xml", config=True, strict=False)
+ session.replace_config_ly.assert_called_with(expected_parse_data, module_name)
Code Review / integration / simulators / nf-simulator / netconf-server.git / commitdiff