Added REST-API to Context service and updated service manifest files.

manifests/contextservice.yaml

@@ -18,6 +18,7 @@ spec:
         imagePullPolicy: Always
         ports:
         - containerPort: 1010
+        - containerPort: 8080
         env:
         - name: DB_ENGINE
           value: "redis"
@@ -51,3 +52,27 @@ spec:
   - name: grpc
     port: 1010
     targetPort: 1010
+  - name: http
+    port: 8080
+    targetPort: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: contextservice-public
+  labels:
+    app: contextservice
+spec:
+  type: NodePort
+  selector:
+    app: contextservice
+  ports:
+  - name: grpc
+    protocol: TCP
+    port: 1010
+    targetPort: 1010
+  - name: http
+    protocol: TCP
+    port: 8080
+    targetPort: 8080
+---

manifests/deviceservice.yaml

@@ -49,5 +49,6 @@ spec:
     app: deviceservice
   ports:
   - name: grpc
+    protocol: TCP
     port: 2020
     targetPort: 2020

manifests/monitoringservice.yaml

@@ -46,5 +46,6 @@ spec:
     app: monitoringservice
   ports:
   - name: grpc
+    protocol: TCP
     port: 8080
     targetPort: 8080

manifests/redis.yaml

@@ -36,3 +36,19 @@ spec:
     port: 6379
     targetPort: 6379
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-public
+  labels:
+    app: redis
+spec:
+  type: NodePort
+  selector:
+    app: redis
+  ports:
+  - name: redis
+    protocol: TCP
+    port: 6379
+    targetPort: 6379
+---

manifests/serviceservice.yaml

@@ -49,5 +49,6 @@ spec:
     app: serviceservice
   ports:
   - name: grpc
+    protocol: TCP
     port: 3030
     targetPort: 3030

src/context/Config.py

@@ -8,8 +8,9 @@ GRPC_SERVICE_PORT = 1010
 GRPC_MAX_WORKERS  = 10
 GRPC_GRACE_PERIOD = 60
 
-# HTTP settings
-HTTP_SERVICE_PORT = 8080
+# REST-API settings
+RESTAPI_SERVICE_PORT = 8080
+RESTAPI_BASE_URL = '/api'
 
 # Prometheus settings
 METRICS_PORT = 9192

src/context/requirements.in

+flask-restful
 grpcio-health-checking
 grpcio
 prometheus-client

src/context/service/__main__.py

 import logging, os, signal, sys, threading
 from prometheus_client import start_http_server
 from common.database.Factory import get_database
+from context.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD, LOG_LEVEL, RESTAPI_SERVICE_PORT, \
+    RESTAPI_BASE_URL, METRICS_PORT
 from context.service.ContextService import ContextService
-from context.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD, LOG_LEVEL, METRICS_PORT
+from context.service.rest_server.Server import Server
+from context.service.rest_server.resources.Context import Context
 
 terminate = threading.Event()
 logger = None
@@ -15,11 +18,13 @@ def signal_handler(signal, frame):
 def main():
     global terminate, logger
 
-    service_port = os.environ.get('CONTEXTSERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT)
-    max_workers  = os.environ.get('MAX_WORKERS',  GRPC_MAX_WORKERS )
-    grace_period = os.environ.get('GRACE_PERIOD', GRPC_GRACE_PERIOD)
-    log_level    = os.environ.get('LOG_LEVEL',    LOG_LEVEL   )
-    metrics_port = os.environ.get('METRICS_PORT', METRICS_PORT)
+    grpc_service_port    = os.environ.get('CONTEXTSERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT   )
+    max_workers          = os.environ.get('MAX_WORKERS',                      GRPC_MAX_WORKERS    )
+    grace_period         = os.environ.get('GRACE_PERIOD',                     GRPC_GRACE_PERIOD   )
+    log_level            = os.environ.get('LOG_LEVEL',                        LOG_LEVEL           )
+    restapi_service_port = os.environ.get('RESTAPI_SERVICE_PORT',             RESTAPI_SERVICE_PORT)
+    restapi_base_url     = os.environ.get('RESTAPI_BASE_URL',                 RESTAPI_BASE_URL    )
+    metrics_port         = os.environ.get('METRICS_PORT',                     METRICS_PORT        )
 
     logging.basicConfig(level=log_level)
     logger = logging.getLogger(__name__)
@@ -36,17 +41,23 @@ def main():
     database = get_database()
 
     # Starting context service
-    service = ContextService(database, port=service_port, max_workers=max_workers, grace_period=grace_period)
-    service.start()
+    grpc_service = ContextService(database, port=grpc_service_port, max_workers=max_workers, grace_period=grace_period)
+    grpc_service.start()
+
+    rest_server = Server(port=restapi_service_port, base_url=restapi_base_url)
+    rest_server.add_resource(Context, '/restconf/config/context', endpoint='api.context')
+    rest_server.start()
 
     # Wait for Ctrl+C or termination signal
-    while not terminate.wait(0.1): pass
+    while not terminate.wait(timeout=0.1): pass
 
     logger.info('Terminating...')
-    service.stop()
+    grpc_service.stop()
+    rest_server.shutdown()
+    rest_server.join()
 
     logger.info('Bye')
-    return(0)
+    return 0
 
 if __name__ == '__main__':
     sys.exit(main())

src/context/service/rest_server/Server.py

+import logging, threading
+from flask import Flask
+from flask_restful import Api
+from werkzeug.serving import make_server
+from context.Config import RESTAPI_BASE_URL, RESTAPI_SERVICE_PORT
+
+logging.getLogger('werkzeug').setLevel(logging.WARNING)
+
+BIND_ADDRESS = '0.0.0.0'
+LOGGER = logging.getLogger(__name__)
+
+class Server(threading.Thread):
+    def __init__(self, host=BIND_ADDRESS, port=RESTAPI_SERVICE_PORT, base_url=RESTAPI_BASE_URL):
+        threading.Thread.__init__(self, daemon=True)
+        self.host = host
+        self.port = port
+        self.app = Flask(__name__)
+        self.api = Api(self.app, prefix=base_url)
+
+    def add_resource(self, resource, *urls, **kwargs):
+        self.api.add_resource(resource, *urls, **kwargs)
+
+    def run(self):
+        self.srv = make_server(self.host, self.port, self.app, threaded=True)
+        self.ctx = self.app.app_context()
+        self.ctx.push()
+        self.srv.serve_forever()
+
+    def shutdown(self):
+        self.srv.shutdown()

src/context/service/rest_server/resources/Context.py

+from flask.json import jsonify
+from flask_restful import Resource
+from common.database.Factory import get_database
+from common.database.api.context.Constants import DEFAULT_CONTEXT_ID
+
+class Context(Resource):
+    def get(self):
+        database = get_database()
+        return jsonify(database.context(DEFAULT_CONTEXT_ID).dump())

src/device/service/__main__.py

@@ -16,10 +16,10 @@ def main():
     global terminate, logger
 
     service_port = os.environ.get('DEVICESERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT)
-    max_workers  = os.environ.get('MAX_WORKERS',  GRPC_MAX_WORKERS )
-    grace_period = os.environ.get('GRACE_PERIOD', GRPC_GRACE_PERIOD)
-    log_level    = os.environ.get('LOG_LEVEL',    LOG_LEVEL   )
-    metrics_port = os.environ.get('METRICS_PORT', METRICS_PORT)
+    max_workers  = os.environ.get('MAX_WORKERS',                     GRPC_MAX_WORKERS )
+    grace_period = os.environ.get('GRACE_PERIOD',                    GRPC_GRACE_PERIOD)
+    log_level    = os.environ.get('LOG_LEVEL',                       LOG_LEVEL        )
+    metrics_port = os.environ.get('METRICS_PORT',                    METRICS_PORT     )
 
     logging.basicConfig(level=log_level)
     logger = logging.getLogger(__name__)
@@ -36,17 +36,17 @@ def main():
     database = get_database()
 
     # Starting device service
-    service = DeviceService(database, port=service_port, max_workers=max_workers, grace_period=grace_period)
-    service.start()
+    grpc_service = DeviceService(database, port=service_port, max_workers=max_workers, grace_period=grace_period)
+    grpc_service.start()
 
     # Wait for Ctrl+C or termination signal
-    while not terminate.wait(0.1): pass
+    while not terminate.wait(timeout=0.1): pass
 
     logger.info('Terminating...')
-    service.stop()
+    grpc_service.stop()
 
     logger.info('Bye')
-    return(0)
+    return 0
 
 if __name__ == '__main__':
     sys.exit(main())

src/service/service/__main__.py

@@ -16,10 +16,10 @@ def main():
     global terminate, logger
 
     service_port = os.environ.get('SERVICESERVICE_SERVICE_PORT_GRPC', GRPC_SERVICE_PORT)
-    max_workers  = os.environ.get('MAX_WORKERS',  GRPC_MAX_WORKERS )
-    grace_period = os.environ.get('GRACE_PERIOD', GRPC_GRACE_PERIOD)
-    log_level    = os.environ.get('LOG_LEVEL',    LOG_LEVEL   )
-    metrics_port = os.environ.get('METRICS_PORT', METRICS_PORT)
+    max_workers  = os.environ.get('MAX_WORKERS',                      GRPC_MAX_WORKERS )
+    grace_period = os.environ.get('GRACE_PERIOD',                     GRPC_GRACE_PERIOD)
+    log_level    = os.environ.get('LOG_LEVEL',                        LOG_LEVEL        )
+    metrics_port = os.environ.get('METRICS_PORT',                     METRICS_PORT     )
 
     logging.basicConfig(level=log_level)
     logger = logging.getLogger(__name__)
@@ -36,17 +36,17 @@ def main():
     database = get_database()
 
     # Starting service service
-    service = ServiceService(database, port=service_port, max_workers=max_workers, grace_period=grace_period)
-    service.start()
+    grpc_service = ServiceService(database, port=service_port, max_workers=max_workers, grace_period=grace_period)
+    grpc_service.start()
 
     # Wait for Ctrl+C or termination signal
-    while not terminate.wait(0.1): pass
+    while not terminate.wait(timeout=0.1): pass
 
     logger.info('Terminating...')
-    service.stop()
+    grpc_service.stop()
 
     logger.info('Bye')
-    return(0)
+    return 0
 
 if __name__ == '__main__':
     sys.exit(main())