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

Merge branch 'feat/362-cttc-update-simap-server-to-support-influxdb-connection' into 'develop' 

Resolve "(CTTC) Update SIMAP server to support InfluxDB connection"

See merge request !416
parents 27216e0b b21a2e10

manifests/simap_connectorservice.yaml

+9 −9
Original line number Original line Diff line number Diff line
@@ -37,21 +37,21 @@ spec: 
          env:

          env:

            - name: LOG_LEVEL

            - name: LOG_LEVEL

              value: "INFO"

              value: "INFO"

            - name: SIMAP_SERVER_SCHEME

            - name: SIMAP_DATASTORE_SCHEME

              value: "http"

              value: "http"

            - name: SIMAP_SERVER_ADDRESS

            - name: SIMAP_DATASTORE_ADDRESS

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # - ./src/tests/tools/simap_server/build.sh

              # - ./src/tests/tools/simap_datastore/build.sh

              # - ./src/tests/tools/simap_server/deploy.sh

              # - ./src/tests/tools/simap_datastore/deploy.sh

              value: "172.17.0.1"

              value: "172.17.0.1"

            - name: SIMAP_SERVER_PORT

            - name: SIMAP_DATASTORE_PORT

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # - ./src/tests/tools/simap_server/build.sh

              # - ./src/tests/tools/simap_datastore/build.sh

              # - ./src/tests/tools/simap_server/deploy.sh

              # - ./src/tests/tools/simap_datastore/deploy.sh

              value: "8080"

              value: "8080"

            - name: SIMAP_SERVER_USERNAME

            - name: SIMAP_DATASTORE_USERNAME

              value: "admin"

              value: "admin"

            - name: SIMAP_SERVER_PASSWORD

            - name: SIMAP_DATASTORE_PASSWORD

              value: "admin"

              value: "admin"

            - name: CRDB_DATABASE

            - name: CRDB_DATABASE

              value: "tfs_simap_connector"

              value: "tfs_simap_connector"

src/common/tools/rest_conf/client/README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,4 +2,4 @@ 




This server implements a basic RESTCONF Client that can be potentially used for any case.

This server implements a basic RESTCONF Client that can be potentially used for any case.





See a simple working example in folder `src/tests/tools/simap_server`
 
See a simple working example in folder `src/tests/tools/simap_datastore`

src/common/tools/rest_conf/server/README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ The server can be configured using the following environment variables: 
- `SECRET_KEY`, defaults to `secrets.token_hex(64)`

- `SECRET_KEY`, defaults to `secrets.token_hex(64)`









See a simple working example in folder `src/tests/tools/simap_server`

See a simple working example in folder `src/tests/tools/simap_datastore`









## Build the RESTCONF Server Docker image

## Build the RESTCONF Server Docker image

src/simap_connector/Config.py

+5 −5
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 




from common.Settings import get_setting

from common.Settings import get_setting





SIMAP_SERVER_SCHEME   = str(get_setting('SIMAP_SERVER_SCHEME',    default='http'     ))

SIMAP_DATASTORE_SCHEME   = str(get_setting('SIMAP_DATASTORE_SCHEME',   default='http'     ))

SIMAP_SERVER_ADDRESS  = str(get_setting('SIMAP_SERVER_ADDRESS',   default='127.0.0.1'))

SIMAP_DATASTORE_ADDRESS  = str(get_setting('SIMAP_DATASTORE_ADDRESS',  default='127.0.0.1'))

SIMAP_SERVER_PORT     = int(get_setting('SIMAP_SERVER_PORT',      default='80'       ))

SIMAP_DATASTORE_PORT     = int(get_setting('SIMAP_DATASTORE_PORT',     default='80'       ))

SIMAP_SERVER_USERNAME = str(get_setting('SIMAP_SERVER_USERNAME',  default='admin'    ))

SIMAP_DATASTORE_USERNAME = str(get_setting('SIMAP_DATASTORE_USERNAME', default='admin'    ))

SIMAP_SERVER_PASSWORD = str(get_setting('SIMAP_SERVER_PASSWORD',  default='admin'    ))
 
SIMAP_DATASTORE_PASSWORD = str(get_setting('SIMAP_DATASTORE_PASSWORD', default='admin'    ))

src/simap_connector/service/__main__.py

+6 −6
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ from common.Settings import ( 
    get_log_level, get_metrics_port, wait_for_environment_variables

    get_log_level, get_metrics_port, wait_for_environment_variables

)

)

from simap_connector.Config import (

from simap_connector.Config import (

    SIMAP_SERVER_SCHEME, SIMAP_SERVER_ADDRESS, SIMAP_SERVER_PORT,

    SIMAP_DATASTORE_SCHEME, SIMAP_DATASTORE_ADDRESS, SIMAP_DATASTORE_PORT,

    SIMAP_SERVER_USERNAME, SIMAP_SERVER_PASSWORD,

    SIMAP_DATASTORE_USERNAME, SIMAP_DATASTORE_PASSWORD,

)

)

from .database.Engine import Engine

from .database.Engine import Engine

from .database.models._Base import rebuild_database

from .database.models._Base import rebuild_database
@@ -76,9 +76,9 @@ def main(): 
    rebuild_database(db_engine)

    rebuild_database(db_engine)





    restconf_client = RestConfClient(

    restconf_client = RestConfClient(

        scheme=SIMAP_SERVER_SCHEME, address=SIMAP_SERVER_ADDRESS,

        scheme   = SIMAP_DATASTORE_SCHEME, address  = SIMAP_DATASTORE_ADDRESS,

        port=SIMAP_SERVER_PORT, username=SIMAP_SERVER_USERNAME,

        port     = SIMAP_DATASTORE_PORT,   username = SIMAP_DATASTORE_USERNAME,

        password=SIMAP_SERVER_PASSWORD,

        password = SIMAP_DATASTORE_PASSWORD,

    )

    )





    simap_client   = SimapClient(restconf_client)

    simap_client   = SimapClient(restconf_client)