Commit 7df750cf authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/362-cttc-update-simap-server-to-support-influxdb-connection' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/366-cttc-simap-ai-engine-framework
parents 01fafbd9 2d3e0380

.gitlab-ci.yml

+67 −61
Original line number Diff line number Diff line 
# # Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

# #

# # Licensed under the Apache License, Version 2.0 (the "License");

# # you may not use this file except in compliance with the License.

# # You may obtain a copy of the License at

# #

# #      http://www.apache.org/licenses/LICENSE-2.0

# #

# # Unless required by applicable law or agreed to in writing, software

# # distributed under the License is distributed on an "AS IS" BASIS,

# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# # See the License for the specific language governing permissions and

# # limitations under the License.

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





# # stages of the cicd pipeline

# stages:

#   #- dependencies

#   - build

#   - unit_test

#   - end2end_test

# stages of the cicd pipeline

stages:

  #- dependencies

  - build

  - unit_test

  - end2end_test



# # include the individual .gitlab-ci.yml of each micro-service and tests

# include:

#   #- local: '/manifests/.gitlab-ci.yml'

#   - local: '/src/monitoring/.gitlab-ci.yml'

#   - local: '/src/nbi/.gitlab-ci.yml'

#   - local: '/src/context/.gitlab-ci.yml'

#   - local: '/src/device/.gitlab-ci.yml'

#   - local: '/src/service/.gitlab-ci.yml'

#   - local: '/src/qkd_app/.gitlab-ci.yml'

#   - local: '/src/dbscanserving/.gitlab-ci.yml'

#   - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

#   - local: '/src/opticalattackdetector/.gitlab-ci.yml'

#   - local: '/src/opticalattackmanager/.gitlab-ci.yml'

#   - local: '/src/opticalcontroller/.gitlab-ci.yml'

#   - local: '/src/ztp/.gitlab-ci.yml'

#   - local: '/src/policy/.gitlab-ci.yml'

#   - local: '/src/automation/.gitlab-ci.yml'

#   - local: '/src/forecaster/.gitlab-ci.yml'

#   #- local: '/src/webui/.gitlab-ci.yml'

#   #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

#   #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

#   #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

#   - local: '/src/slice/.gitlab-ci.yml'

#   #- local: '/src/interdomain/.gitlab-ci.yml'

#   - local: '/src/pathcomp/.gitlab-ci.yml'

#   #- local: '/src/dlt/.gitlab-ci.yml'

#   - local: '/src/load_generator/.gitlab-ci.yml'

#   - local: '/src/bgpls_speaker/.gitlab-ci.yml'

#   - local: '/src/kpi_manager/.gitlab-ci.yml'

#   - local: '/src/kpi_value_api/.gitlab-ci.yml'

#   #- local: '/src/kpi_value_writer/.gitlab-ci.yml'

#   #- local: '/src/telemetry/.gitlab-ci.yml'

#   - local: '/src/analytics/.gitlab-ci.yml'

#   - local: '/src/qos_profile/.gitlab-ci.yml'

#   - local: '/src/vnt_manager/.gitlab-ci.yml'

#   - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

#   - local: '/src/ztp_server/.gitlab-ci.yml'

#   - local: '/src/osm_client/.gitlab-ci.yml'

#   - local: '/src/simap_connector/.gitlab-ci.yml'

#   - local: '/src/pluggables/.gitlab-ci.yml'

workflow:

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

      when: always

    - when: never



#   # This should be last one: end-to-end integration tests

#   - local: '/src/tests/.gitlab-ci.yml'
 
# include the individual .gitlab-ci.yml of each micro-service and tests

include:

  #- local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/nbi/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'

  - local: '/src/qkd_app/.gitlab-ci.yml'

  - local: '/src/dbscanserving/.gitlab-ci.yml'

  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  - local: '/src/opticalattackdetector/.gitlab-ci.yml'

  - local: '/src/opticalattackmanager/.gitlab-ci.yml'

  - local: '/src/opticalcontroller/.gitlab-ci.yml'

  - local: '/src/ztp/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/forecaster/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

  - local: '/src/slice/.gitlab-ci.yml'

  #- local: '/src/interdomain/.gitlab-ci.yml'

  - local: '/src/pathcomp/.gitlab-ci.yml'

  #- local: '/src/dlt/.gitlab-ci.yml'

  - local: '/src/load_generator/.gitlab-ci.yml'

  - local: '/src/bgpls_speaker/.gitlab-ci.yml'

  - local: '/src/kpi_manager/.gitlab-ci.yml'

  - local: '/src/kpi_value_api/.gitlab-ci.yml'

  #- local: '/src/kpi_value_writer/.gitlab-ci.yml'

  #- local: '/src/telemetry/.gitlab-ci.yml'

  - local: '/src/analytics/.gitlab-ci.yml'

  - local: '/src/qos_profile/.gitlab-ci.yml'

  - local: '/src/vnt_manager/.gitlab-ci.yml'

  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

  - local: '/src/ztp_server/.gitlab-ci.yml'

  - local: '/src/osm_client/.gitlab-ci.yml'

  - local: '/src/simap_connector/.gitlab-ci.yml'

  - local: '/src/pluggables/.gitlab-ci.yml'



  # This should be last one: end-to-end integration tests

  - local: '/src/tests/.gitlab-ci.yml'

manifests/simap_connectorservice.yaml

+9 −9
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
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/README.md

+1 −1
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/common/tools/rest_conf/server/requirements.in

+0 −1
Original line number Diff line number Diff line
@@ -24,4 +24,3 @@ libyang==2.8.4 
pyopenssl==23.0.0

requests==2.27.1

werkzeug==2.3.7
 
influxdb3-python==0.16.0