Move away elivepatch_server/elivepatch_server.py

Fixes #28

Now both `python run.py` and `python setup.py install` work.

Author: lu-zero

README.md

@@ -1,2 +1,20 @@
 # elivepatch-server
 Flexible Distributed Linux Kernel Live Patching
+
+
+## Setup
+`elivepatch-server` is a [flask](https://www.palletsprojects.com/p/flask/)-based application.
+
+You can use [virtualenv](https://virtualenv.pypa.io/en/stable/) to have a separate python3 environment.
+``` sh
+$ cd elivepatch-server
+$ virtualenv .venv
+$ source .venv/bin/activate
+$ pip install -r requirements
+```
+
+``` sh
+$ python elivepatch-server
+```
+
+Will run the server using [werkzeug](https://palletsprojects.com/p/werkzeug/)

elivepatch_server/__init__.py

@@ -7,3 +7,73 @@
 __version__ = '0.1'
 __author__ = 'Alice Ferrazzi'
 __license__ = 'GNU GPLv2+'
+
+from flask import Flask
+from flask_restful import Api
+import multiprocessing
+import argparse
+from .resources import AgentInfo, dispatcher
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('-j', '--jobs', type=int,
+                        default=multiprocessing.cpu_count(),
+                        help='Specify the number of make jobs')
+
+    parser.add_argument('-H', '--host', type=str,
+                        default='0.0.0.0',
+                        help='Specify the host')
+
+    parser.add_argument('-P', '--port', type=int,
+                        default='5000',
+                        help='Specify the port')
+
+    parser.add_argument('-T', '--threaded', action='store_true',
+                        help='Enable threading')
+
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debugging')
+
+    return parser.parse_args()
+
+
+def create_app(cmdline_args):
+    """
+    Create server application
+    RESTful api version 1.0
+    """
+
+    app = Flask(__name__, static_url_path="")
+    api = Api(app)
+
+    api.add_resource(AgentInfo.AgentAPI, '/elivepatch/api/',
+                     endpoint='root')
+
+    # get agento information
+    api.add_resource(AgentInfo.AgentAPI, '/elivepatch/api/v1.0/agent',
+                     endpoint='agent')
+
+    # where to retrieve the live patch when ready
+    api.add_resource(dispatcher.SendLivePatch,
+                     '/elivepatch/api/v1.0/send_livepatch',
+                     endpoint='send_livepatch')
+
+    # where to receive the config file
+    api.add_resource(dispatcher.GetFiles, '/elivepatch/api/v1.0/get_files',
+                     endpoint='config',
+                     resource_class_kwargs={'cmdline_args': cmdline_args})
+    return app
+
+
+def run():
+    cmdline_args = parse_args()
+    app = create_app(cmdline_args)
+    app.run(debug=cmdline_args.debug,
+            host=cmdline_args.host, port=cmdline_args.port,
+            threaded=cmdline_args.threaded)
+
+
+if __name__ == '__main__':
+    run()

elivepatch_server/elivepatch_server.py

@@ -0,0 +1,3 @@
+from elivepatch_server import run
+
+run()

run.py

@@ -27,6 +27,8 @@
     author='Alice Ferrazzi',
     author_email='alice.ferrazzi@gmail.com',
     license='GNU GPLv2+',
-    packages=['elivepatch_server','elivepatch_server.resources'],
-    scripts=['elivepatch_server/elivepatch_server'],
+    packages=['elivepatch_server/'],
+    entry_points = {
+        'console_scripts': ['elivepatch_server=elivepatch_server:run']
+    }
 )

setup.py

@@ -2,7 +2,7 @@
 import os.path
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.pardir))
 
-from elivepatch_server.elivepatch_server import create_app
+from elivepatch_server import create_app
 import pytest
 from flask_restful import Api as api
 from flask_testing import TestCase

tests/conftest.py

@@ -1,4 +1,4 @@
-from elivepatch_server.elivepatch_server import create_app
+from elivepatch_server import create_app
 import pytest
 from flask_restful import Api as api
 from conftest import app
@@ -21,7 +21,7 @@ def setUp(self):
     def test_not_found(self):
         response = self.app.get('/')
         assert response.status_code == 404
-    
+
     def test_found(self):
         response = self.app.get('/elivepatch/api/')
         assert response.status_code == 200