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

Waleed Akbarrequested to merge
feat/362-cttc-update-simap-server-to-support-influxdb-connection into develop

Closes #362 (closed)

Merge request reports

manifests/simap_connectorservice.yaml

+9 −9
Changes for manifests/simap_connectorservice.yaml: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -37,21 +37,21 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "INFO"

            - name: SIMAP_SERVER_SCHEME

            - name: SIMAP_DATASTORE_SCHEME

              value: "http"

            - name: SIMAP_SERVER_ADDRESS

            - name: SIMAP_DATASTORE_ADDRESS

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

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

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

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

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

              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:

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

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

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

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

              value: "8080"

            - name: SIMAP_SERVER_USERNAME

            - name: SIMAP_DATASTORE_USERNAME

              value: "admin"

            - name: SIMAP_SERVER_PASSWORD

            - name: SIMAP_DATASTORE_PASSWORD

              value: "admin"

            - name: CRDB_DATABASE

              value: "tfs_simap_connector"

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

+1 −1
Changes for src/common/tools/rest_conf/client/README.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 


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/restconf_server/app.py

+2 −2

File changed.

Contains only whitespace changes.

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

+1 −1
Changes for src/common/tools/rest_conf/server/README.md: 1 added line, 1 removed line.
Original line number 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)`





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

src/simap_connector/service/simap_updater/AllowedLinks.py

+2 −2
Changes for src/simap_connector/service/simap_updater/AllowedLinks.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


ALLOWED_LINKS_PER_CONTROLLER = {

    'e2e'      : { 'L1',    'L2',    'L3',    'L4'            },

    'agg'      : {'L7ab', 'L7ba', 'L8ab', 'L8ba', 'L11ab', 'L11ba',

                  'L12ab', 'L12ba', 'L13', 'L14'},

    'agg'      : { 'L7ab',  'L7ba',  'L8ab',  'L8ba', 'L11ab',

                   'L11ba', 'L12ab', 'L12ba', 'L13',  'L14'   },

    'trans-pkt': { 'L5',    'L6',    'L9',    'L10'           },

}