Commit e3c2a213 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Moved QKD App NBI to NBI Component

parent 7f00e623

manifests/nginx_ingress_http.yaml

+2 −2
Original line number Diff line number Diff line
@@ -66,6 +66,6 @@ spec: 
            pathType: Prefix

            backend:

              service:

                name: qkd-appservice

                name: nbiservice

                port:

                  number: 8005
 
                  number: 8080

manifests/qkd_appservice.yaml

+37 −41
Original line number Diff line number Diff line
@@ -34,11 +34,10 @@ spec: 
          ports:

            - containerPort: 10060

            - containerPort: 9192

        - containerPort: 8005

          env:

            - name: LOG_LEVEL

          value: "DEBUG"

        - name: CRDB_DATABASE_APP

              value: "INFO"

            - name: CRDB_DATABASE

              value: "qkd_app"

          envFrom:

            - secretRef:
@@ -78,6 +77,3 @@ spec: 
      protocol: TCP

      port: 9192

      targetPort: 9192
 
  - name: http

    port: 8005

    targetPort: 8005

src/common/Constants.py

+4 −7
Original line number Diff line number Diff line
@@ -114,15 +114,12 @@ DEFAULT_SERVICE_GRPC_PORTS = { 


# Default HTTP/REST-API service ports

DEFAULT_SERVICE_HTTP_PORTS = {

    ServiceNameEnum.CONTEXT   .value : 8080,

    ServiceNameEnum.NBI  .value : 8080,

    ServiceNameEnum.WEBUI.value : 8004,

    ServiceNameEnum.QKD_APP   .value : 8005,

}



# Default HTTP/REST-API service base URLs

DEFAULT_SERVICE_HTTP_BASEURLS = {

    ServiceNameEnum.NBI  .value : None,

    ServiceNameEnum.WEBUI.value : None,

    ServiceNameEnum.QKD_APP   .value : None,

}

src/common/Settings.py

+5 −3
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
import logging, os, re, time

from typing import Dict, List

from common.Constants import (

    DEFAULT_GRPC_BIND_ADDRESS, DEFAULT_GRPC_GRACE_PERIOD, DEFAULT_GRPC_MAX_WORKERS, DEFAULT_HTTP_BIND_ADDRESS,

    DEFAULT_LOG_LEVEL, DEFAULT_METRICS_PORT, DEFAULT_SERVICE_GRPC_PORTS, DEFAULT_SERVICE_HTTP_BASEURLS,

    DEFAULT_SERVICE_HTTP_PORTS, ServiceNameEnum

    DEFAULT_GRPC_BIND_ADDRESS, DEFAULT_GRPC_GRACE_PERIOD,

    DEFAULT_GRPC_MAX_WORKERS, DEFAULT_HTTP_BIND_ADDRESS,

    DEFAULT_LOG_LEVEL, DEFAULT_METRICS_PORT, DEFAULT_SERVICE_GRPC_PORTS,

    DEFAULT_SERVICE_HTTP_BASEURLS, DEFAULT_SERVICE_HTTP_PORTS,

    ServiceNameEnum

)



LOGGER = logging.getLogger(__name__)

src/nbi/service/__main__.py

+6 −3
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ import logging, signal, sys, threading 
from prometheus_client import start_http_server

from common.Constants import ServiceNameEnum

from common.Settings import (

    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,

    wait_for_environment_variables)



    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC,

    get_env_var_name, get_log_level, get_metrics_port,

    wait_for_environment_variables

)

from .NbiService import NbiService

from .rest_server.RestServer import RestServer

from .rest_server.nbi_plugins.etsi_bwm import register_etsi_bwm_api
@@ -28,6 +29,7 @@ from .rest_server.nbi_plugins.ietf_l3vpn import register_ietf_l3vpn 
from .rest_server.nbi_plugins.ietf_network import register_ietf_network

from .rest_server.nbi_plugins.ietf_network_slice import register_ietf_nss

from .rest_server.nbi_plugins.ietf_acl import register_ietf_acl

from .rest_server.nbi_plugins.qkd_app import register_qkd_app

from .rest_server.nbi_plugins.tfs_api import register_tfs_api



terminate = threading.Event()
@@ -72,6 +74,7 @@ def main(): 
    register_ietf_network(rest_server)

    register_ietf_nss(rest_server)  # Registering NSS entrypoint

    register_ietf_acl(rest_server)

    register_qkd_app(rest_server)

    register_tfs_api(rest_server)

    rest_server.start()