manifests/servicemonitors.yaml

-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -20,9 +20,9 @@ metadata:
   labels:
     app: contextservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -32,14 +32,14 @@ spec:
       app: contextservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -49,9 +49,9 @@ metadata:
   labels:
     app: deviceservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -61,14 +61,14 @@ spec:
       app: deviceservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -78,9 +78,9 @@ metadata:
   labels:
     app: serviceservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -90,14 +90,14 @@ spec:
       app: serviceservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -107,9 +107,9 @@ metadata:
   labels:
     app: sliceservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -119,14 +119,14 @@ spec:
       app: sliceservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -136,9 +136,9 @@ metadata:
   labels:
     app: pathcompservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -148,14 +148,14 @@ spec:
       app: pathcompservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -165,9 +165,9 @@ metadata:
   labels:
     app: monitoringservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -177,14 +177,14 @@ spec:
       app: monitoringservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -194,9 +194,9 @@ metadata:
   labels:
     app: dltservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -206,14 +206,14 @@ spec:
       app: dltservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -223,9 +223,9 @@ metadata:
   labels:
     app: interdomainservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -235,14 +235,14 @@ spec:
       app: interdomainservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -252,9 +252,9 @@ metadata:
   labels:
     app: policyservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -264,72 +264,72 @@ spec:
       app: policyservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /q/metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /q/metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   namespace: monitoring # namespace where prometheus is running
-  name: tfs-automationservice-metric
+  name: tfs-ztpservice-metric
   labels:
-    app: automationservice
+    app: ztpservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
     matchLabels:
       # Target app service
       #namespace: tfs
-      app: automationservice # same as above
+      app: ztpservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /q/metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /q/metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   namespace: monitoring # namespace where prometheus is running
-  name: tfs-computeservice-metric
+  name: tfs-nbiservice-metric
   labels:
-    app: computeservice
+    app: nbiservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
     matchLabels:
       # Target app service
       #namespace: tfs
-      app: computeservice # same as above
+      app: nbiservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -339,9 +339,9 @@ metadata:
   labels:
     app: load-generatorservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -351,14 +351,14 @@ spec:
       app: load-generatorservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -368,9 +368,9 @@ metadata:
   labels:
     app: dbscanservingservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -380,14 +380,14 @@ spec:
       app: dbscanservingservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -397,9 +397,9 @@ metadata:
   labels:
     app: opticalattackmitigatorservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -409,14 +409,14 @@ spec:
       app: opticalattackmitigatorservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -426,9 +426,9 @@ metadata:
   labels:
     app: opticalattackdetectorservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -438,14 +438,14 @@ spec:
       app: opticalattackdetectorservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
+      - tfs # namespace where the app is running
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -455,9 +455,9 @@ metadata:
   labels:
     app: opticalattackmanagerservice
     #release: prometheus
-    #release: prom  # name of the release 
-    # ( VERY IMPORTANT: You need to know the correct release name by viewing 
-    #   the servicemonitor of Prometheus itself: Without the correct name, 
+    #release: prom  # name of the release
+    # ( VERY IMPORTANT: You need to know the correct release name by viewing
+    #   the servicemonitor of Prometheus itself: Without the correct name,
     #   Prometheus cannot identify the metrics of the Flask app as the target.)
 spec:
   selector:
@@ -467,11 +467,11 @@ spec:
       app: opticalattackmanagerservice # same as above
       #release: prometheus # same as above
   endpoints:
-  - port: metrics # named port in target app
-    scheme: http
-    path: /metrics # path to scrape
-    interval: 5s # scrape interval
+    - port: metrics # named port in target app
+      scheme: http
+      path: /metrics # path to scrape
+      interval: 5s # scrape interval
   namespaceSelector:
     any: false
     matchNames:
-    - tfs # namespace where the app is running
\ No newline at end of file
+      - tfs # namespace where the app is running

manifests/serviceservice.yaml

-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -28,28 +28,28 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
-        image: labs.etsi.org:5050/tfs/controller/service:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 3030
-        - containerPort: 9192
-        env:
-        - name: LOG_LEVEL
-          value: "INFO"
-        readinessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:3030"]
-        livenessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:3030"]
-        resources:
-          requests:
-            cpu: 250m
-            memory: 128Mi
-          limits:
-            cpu: 1000m
-            memory: 1024Mi
+        - name: server
+          image: labs.etsi.org:5050/tfs/controller/service:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 3030
+            - containerPort: 9192
+          env:
+            - name: LOG_LEVEL
+              value: "INFO"
+          readinessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:3030"]
+          livenessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:3030"]
+          resources:
+            requests:
+              cpu: 250m
+              memory: 128Mi
+            limits:
+              cpu: 1000m
+              memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
@@ -62,14 +62,14 @@ spec:
   selector:
     app: serviceservice
   ports:
-  - name: grpc
-    protocol: TCP
-    port: 3030
-    targetPort: 3030
-  - name: metrics
-    protocol: TCP
-    port: 9192
-    targetPort: 9192
+    - name: grpc
+      protocol: TCP
+      port: 3030
+      targetPort: 3030
+    - name: metrics
+      protocol: TCP
+      port: 9192
+      targetPort: 9192
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
@@ -83,12 +83,12 @@ spec:
   minReplicas: 1
   maxReplicas: 20
   metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      target:
-        type: Utilization
-        averageUtilization: 80
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80
   #behavior:
   #  scaleDown:
   #    stabilizationWindowSeconds: 30

manifests/sliceservice.yaml

-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -28,33 +28,33 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: server
-        image: labs.etsi.org:5050/tfs/controller/slice:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 4040
-        - containerPort: 9192
-        env:
-        - name: LOG_LEVEL
-          value: "INFO"
-        - name: SLICE_GROUPING
-          value: "DISABLE"
-        envFrom:
-        - secretRef:
-            name: qdb-data
-        readinessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:4040"]
-        livenessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:4040"]
-        resources:
-          requests:
-            cpu: 250m
-            memory: 128Mi
-          limits:
-            cpu: 1000m
-            memory: 1024Mi
+        - name: server
+          image: labs.etsi.org:5050/tfs/controller/slice:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 4040
+            - containerPort: 9192
+          env:
+            - name: LOG_LEVEL
+              value: "INFO"
+            - name: SLICE_GROUPING
+              value: "DISABLE"
+          envFrom:
+            - secretRef:
+                name: qdb-data
+          readinessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:4040"]
+          livenessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:4040"]
+          resources:
+            requests:
+              cpu: 250m
+              memory: 128Mi
+            limits:
+              cpu: 1000m
+              memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
@@ -67,14 +67,14 @@ spec:
   selector:
     app: sliceservice
   ports:
-  - name: grpc
-    protocol: TCP
-    port: 4040
-    targetPort: 4040
-  - name: metrics
-    protocol: TCP
-    port: 9192
-    targetPort: 9192
+    - name: grpc
+      protocol: TCP
+      port: 4040
+      targetPort: 4040
+    - name: metrics
+      protocol: TCP
+      port: 9192
+      targetPort: 9192
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
@@ -88,12 +88,12 @@ spec:
   minReplicas: 1
   maxReplicas: 20
   metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      target:
-        type: Utilization
-        averageUtilization: 80
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80
   #behavior:
   #  scaleDown:
   #    stabilizationWindowSeconds: 30

manifests/teservice.yaml

-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -30,37 +30,37 @@ spec:
       terminationGracePeriodSeconds: 5
       shareProcessNamespace: true
       containers:
-      - name: server
-        image: labs.etsi.org:5050/tfs/controller/te:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 10030
-        env:
-        - name: ERLANG_LOGGER_LEVEL
-          value: "debug"
-        - name: ERLANG_COOKIE
-          value: "tfte-unsafe-cookie"
-        - name: ERLANG_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: ERLANG_NODE_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        readinessProbe:
-          exec:
-            command: ["/tfte/bin/tfte", "status"]
-        livenessProbe:
-          exec:
-            command: ["/tfte/bin/tfte", "status"]
-        resources:
-          requests:
-            cpu: 250m
-            memory: 512Mi
-          limits:
-            cpu: 700m
-            memory: 1024Mi
+        - name: server
+          image: labs.etsi.org:5050/tfs/controller/te:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 10030
+          env:
+            - name: ERLANG_LOGGER_LEVEL
+              value: "debug"
+            - name: ERLANG_COOKIE
+              value: "tfte-unsafe-cookie"
+            - name: ERLANG_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: ERLANG_NODE_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+          readinessProbe:
+            exec:
+              command: ["/tfte/bin/tfte", "status"]
+          livenessProbe:
+            exec:
+              command: ["/tfte/bin/tfte", "status"]
+          resources:
+            requests:
+              cpu: 250m
+              memory: 512Mi
+            limits:
+              cpu: 700m
+              memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
@@ -71,11 +71,11 @@ spec:
   selector:
     app: teservice
   ports:
-  - name: grpc
-    protocol: TCP
-    port: 10030
-    targetPort: 10030
-  - name: pcep
-    protocol: TCP
-    port: 4189
-    targetPort: 4189
+    - name: grpc
+      protocol: TCP
+      port: 10030
+      targetPort: 10030
+    - name: pcep
+      protocol: TCP
+      port: 4189
+      targetPort: 4189

manifests/webuiservice.yaml

-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -32,72 +32,73 @@ spec:
         supplementalGroups:
           - 0
       containers:
-      - name: server
-        image: labs.etsi.org:5050/tfs/controller/webui:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8004
-        env:
-        - name: LOG_LEVEL
-          value: "INFO"
-        - name: WEBUISERVICE_SERVICE_BASEURL_HTTP
-          value: "/webui/"
-        readinessProbe:
-          httpGet:
-            path: /healthz/ready
-            port: 8004
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
-        livenessProbe:
-          httpGet:
-            path: /healthz/live
-            port: 8004
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 50m
-            memory: 128Mi
-          limits:
-            cpu: 1000m
-            memory: 1024Mi
-      - name: grafana
-        image: grafana/grafana:8.5.22
-        imagePullPolicy: IfNotPresent
-        ports:
-          - containerPort: 3000
-            name: http-grafana
-            protocol: TCP
-        env:
-        - name: GF_SERVER_ROOT_URL
-          value: "http://0.0.0.0:3000/grafana/"
-        - name: GF_SERVER_SERVE_FROM_SUB_PATH
-          value: "true"
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /robots.txt
-            port: 3000
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 30
-          successThreshold: 1
-          timeoutSeconds: 2
-        livenessProbe:
-          failureThreshold: 3
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          successThreshold: 1
-          tcpSocket:
-            port: 3000
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 150m
-            memory: 512Mi
-          limits:
-            cpu: 500m
-            memory: 1024Mi
+        - name: server
+          image: labs.etsi.org:5050/tfs/controller/webui:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8004
+          env:
+            - name: LOG_LEVEL
+              value: "INFO"
+            - name: WEBUISERVICE_SERVICE_BASEURL_HTTP
+              value: "/webui/"
+          readinessProbe:
+            httpGet:
+              path: /healthz/ready
+              port: 8004
+            initialDelaySeconds: 5
+            timeoutSeconds: 1
+          livenessProbe:
+            httpGet:
+              path: /healthz/live
+              port: 8004
+            initialDelaySeconds: 5
+            timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 50m
+              memory: 128Mi
+            limits:
+              cpu: 1000m
+              memory: 1024Mi
+        - name: grafana
+          image: grafana/grafana:8.5.22
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 3000
+              name: http-grafana
+              protocol: TCP
+          env:
+            - name: GF_SERVER_ROOT_URL
+              value: "http://0.0.0.0:3000/grafana/"
+            - name: GF_SERVER_SERVE_FROM_SUB_PATH
+              value: "true"
+          readinessProbe:
+            failureThreshold: 60
+            httpGet:
+              #path: /robots.txt
+              path: /login
+              port: 3000
+              scheme: HTTP
+            initialDelaySeconds: 1
+            periodSeconds: 1
+            successThreshold: 1
+            timeoutSeconds: 2
+          livenessProbe:
+            failureThreshold: 60
+            initialDelaySeconds: 1
+            periodSeconds: 1
+            successThreshold: 1
+            tcpSocket:
+              port: 3000
+            timeoutSeconds: 1
+          resources:
+            requests:
+              cpu: 250m
+              memory: 512Mi
+            limits:
+              cpu: 500m
+              memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
@@ -110,9 +111,9 @@ spec:
   selector:
     app: webuiservice
   ports:
-  - name: webui
-    port: 8004
-    targetPort: 8004
-  - name: grafana
-    port: 3000
-    targetPort: 3000
+    - name: webui
+      port: 8004
+      targetPort: 8004
+    - name: grafana
+      port: 3000
+      targetPort: 3000

manifests/ztpservice.yaml

+# Copyright 2022-2024 ETSI OSG/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.
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000
+  labels:
+    app.kubernetes.io/name: ztpservice
+    app: ztpservice
+  name: ztpservice
+spec:
+  ports:
+    - name: grpc
+      port: 5050
+      targetPort: 5050
+    - name: metrics
+      protocol: TCP
+      port: 9192
+      targetPort: 8080
+  selector:
+    app.kubernetes.io/name: ztpservice
+  type: ClusterIP
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000
+  labels:
+    app: ztpservice
+    app.kubernetes.io/name: ztpservice
+  name: ztpservice
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: ztpservice
+  template:
+    metadata:
+      annotations:
+        app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000
+      labels:
+        app: ztpservice
+        app.kubernetes.io/name: ztpservice
+    spec:
+      containers:
+        - env:
+            - name: KUBERNETES_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: CONTEXT_SERVICE_HOST
+              value: contextservice
+            - name: DEVICE_SERVICE_HOST
+              value: deviceservice
+          image: labs.etsi.org:5050/tfs/controller/ztp:0.2.0
+          imagePullPolicy: Always
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /q/health/live
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 2
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 10
+          name: ztpservice
+          ports:
+            - containerPort: 5050
+              name: grpc
+              protocol: TCP
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /q/health/ready
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 2
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 10
+          resources:
+            requests:
+              cpu: 50m
+              memory: 512Mi
+            limits:
+              cpu: 2000m
+              memory: 2048Mi
+#---
+#apiVersion: autoscaling/v2
+#kind: HorizontalPodAutoscaler
+#metadata:
+#  name: ztpservice-hpa
+#spec:
+#  scaleTargetRef:
+#    apiVersion: apps/v1
+#    kind: Deployment
+#    name: ztpservice
+#  minReplicas: 1
+#  maxReplicas: 10
+#  metrics:
+#    - type: Resource
+#      resource:
+#        name: cpu
+#        target:
+#          type: Utilization
+#          averageUtilization: 80

my_deploy.sh

 #!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/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.
@@ -20,13 +20,29 @@
 export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
 
 # Set the list of components, separated by spaces, you want to build images for, and deploy.
-export TFS_COMPONENTS="context device pathcomp service slice compute webui load_generator"
+export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
 
 # Uncomment to activate Monitoring
 #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
 
-# Uncomment to activate Automation and Policy Manager
-#export TFS_COMPONENTS="${TFS_COMPONENTS} automation policy"
+# Uncomment to activate BGP-LS Speaker
+#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
+
+# Uncomment to activate Optical Controller
+#   To manage optical connections, "service" requires "opticalcontroller" to be deployed
+#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the
+#   "opticalcontroller" only if "service" is already in TFS_COMPONENTS, and re-export it.
+#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then
+#    BEFORE="${TFS_COMPONENTS% service*}"
+#    AFTER="${TFS_COMPONENTS#* service}"
+#    export TFS_COMPONENTS="${BEFORE} opticalcontroller service ${AFTER}"
+#fi
+
+# Uncomment to activate ZTP
+#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
+
+# Uncomment to activate Policy Manager
+#export TFS_COMPONENTS="${TFS_COMPONENTS} policy"
 
 # Uncomment to activate Optical CyberSecurity
 #export TFS_COMPONENTS="${TFS_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector opticalattackmanager"
@@ -37,6 +53,12 @@ export TFS_COMPONENTS="context device pathcomp service slice compute webui load_
 # Uncomment to activate TE
 #export TFS_COMPONENTS="${TFS_COMPONENTS} te"
 
+# Uncomment to activate Forecaster
+#export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"
+
+# Uncomment to activate E2E Orchestrator
+#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"
+
 # Set the tag you want to use for your images.
 export TFS_IMAGE_TAG="dev"
 

ofc24

+src/tests/ofc24/
\ No newline at end of file

proto/acl.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/attack_mitigator.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/automation.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-syntax = "proto3";
-package automation;
-
-import "context.proto";
-
-service AutomationService {
-  rpc ZtpGetDeviceRole(DeviceRoleId) returns (DeviceRole) {}
-  rpc ZtpGetDeviceRolesByDeviceId(context.DeviceId) returns (DeviceRoleList) {}
-  rpc ZtpAdd(DeviceRole) returns (DeviceRoleState) {}
-  rpc ZtpUpdate(DeviceRoleConfig) returns (DeviceRoleState) {}
-  rpc ZtpDelete(DeviceRole) returns (DeviceRoleState) {}
-  rpc ZtpDeleteAll(context.Empty) returns (DeviceDeletionResult) {}
-}
-
-enum DeviceRoleType {
-  NONE = 0;
-  DEV_OPS = 1;
-  DEV_CONF = 2;
-  PIPELINE_CONF = 3;
-}
-
-message DeviceRoleId {
-  context.Uuid devRoleId = 1;
-  context.DeviceId devId = 2;
-}
-
-message DeviceRole {
-  DeviceRoleId devRoleId = 1;
-  DeviceRoleType devRoleType = 2;
-}
-
-message DeviceRoleConfig {
-  DeviceRole devRole = 1;
-  context.DeviceConfig devConfig = 2;
-}
-
-message DeviceRoleList {
-  repeated DeviceRole devRole = 1;
-}
-
-message DeviceRoleState {
-  DeviceRoleId devRoleId = 1;
-  ZtpDeviceState devRoleState = 2;
-}
-
-message DeviceDeletionResult {
-  repeated string deleted = 1;
-}
-
-enum ZtpDeviceState {
-  ZTP_DEV_STATE_UNDEFINED = 0;
-  ZTP_DEV_STATE_CREATED  = 1;
-  ZTP_DEV_STATE_UPDATED  = 2;
-  ZTP_DEV_STATE_DELETED  = 3;
-}

proto/bgpls.proto

+// Copyright 2022-2024 ETSI OSG/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.
+
+syntax = "proto3";
+package bgpls;
+
+import "context.proto";
+
+service BgplsService {
+  rpc ListDiscoveredDevices (context.Empty  ) returns (DiscoveredDeviceList) {}
+  rpc ListDiscoveredLinks   (context.Empty  ) returns (DiscoveredLinkList  ) {}
+  rpc AddBgplsSpeaker       (BgplsSpeaker   ) returns (BgplsSpeakerId      ) {}
+  rpc ListBgplsSpeakers     (context.Empty  ) returns (BgplsSpeakerList    ) {}
+  rpc DisconnectFromSpeaker (BgplsSpeaker   ) returns (context.Empty       ) {}
+  rpc GetSpeakerInfoFromId  (BgplsSpeakerId ) returns (BgplsSpeaker        ) {}
+  rpc NotifyAddNodeToContext(NodeDescriptors) returns (context.Empty       ) {}
+}
+
+message DiscoveredDevice {
+  string nodeName = 1;
+  string ip = 2;
+  string igpID = 3;
+  string learntFrom = 4;
+}
+
+message DiscoveredDeviceList {
+  repeated DiscoveredDevice discovereddevices = 1;
+}
+
+message DiscoveredLinkList{
+  repeated DiscoveredLink discoveredlinks = 1;
+}
+
+message DiscoveredLink{
+  NodeDescriptors local  = 1;
+	NodeDescriptors remote = 2;
+  string learntFrom      = 3;
+  string local_ipv4      = 4;
+  string remote_ipv4     = 5;
+}
+
+message NodeDescriptors{
+	string asNumber = 1;
+	string igp_id   = 2;
+  string nodeName = 3;
+}
+
+message BgplsSpeaker{
+  string address  = 1;
+  string port     = 2;
+  string asNumber = 3;
+}
+message BgplsSpeakerId{
+  uint32 id = 1;
+}
+
+message BgplsSpeakerList{
+  repeated BgplsSpeakerId speakers = 1;
+}

proto/compute.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-syntax = "proto3";
-package compute;
-
-import "context.proto";
-
-service ComputeService {
-  rpc CheckCredentials                 (context.TeraFlowController) returns (context.AuthenticationResult) {}
-  rpc GetConnectivityServiceStatus     (context.ServiceId         ) returns (context.ServiceStatus       ) {}
-  rpc CreateConnectivityService        (context.Service           ) returns (context.ServiceId           ) {}
-  rpc EditConnectivityService          (context.Service           ) returns (context.ServiceId           ) {}
-  rpc DeleteConnectivityService        (context.Service           ) returns (context.Empty               ) {}
-  rpc GetAllActiveConnectivityServices (context.Empty             ) returns (context.ServiceIdList       ) {}
-  rpc ClearAllConnectivityServices     (context.Empty             ) returns (context.Empty               ) {}
-}

proto/context.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.
@@ -74,6 +74,16 @@ service ContextService {
   rpc SetConnection      (Connection    ) returns (       ConnectionId    ) {}
   rpc RemoveConnection   (ConnectionId  ) returns (       Empty           ) {}
   rpc GetConnectionEvents(Empty         ) returns (stream ConnectionEvent ) {}
+
+ 
+  // ------------------------------ Experimental -----------------------------
+  rpc GetOpticalConfig   (Empty          ) returns (OpticalConfigList     ) {}
+  rpc SetOpticalConfig   (OpticalConfig  ) returns (OpticalConfigId       ) {}
+  rpc SelectOpticalConfig(OpticalConfigId) returns (OpticalConfig         ) {}
+
+  rpc SetOpticalLink     (OpticalLink    ) returns (Empty                 ) {}
+  rpc GetOpticalLink     (OpticalLinkId  ) returns (OpticalLink           ) {}
+  rpc GetFiber           (FiberId        ) returns (Fiber                 ) {}
 }
 
 // ----- Generic -------------------------------------------------------------------------------------------------------
@@ -174,12 +184,17 @@ message Device {
   DeviceOperationalStatusEnum device_operational_status = 5;
   repeated DeviceDriverEnum device_drivers = 6;
   repeated EndPoint device_endpoints = 7;
-  repeated Component component = 8; // Used for inventory
+  repeated Component components = 8; // Used for inventory
   DeviceId controller_id = 9; // Identifier of node controlling the actual device
 }
 
-message Component {
-  repeated string comp_string = 1;
+message Component {                         //Defined previously to this section - Tested OK
+  Uuid component_uuid   = 1;
+  string name           = 2;
+  string type           = 3;
+  
+  map<string, string> attributes = 4; // dict[attr.name => json.dumps(attr.value)]
+  string parent         = 5;
 }
 
 message DeviceConfig {
@@ -192,10 +207,13 @@ enum DeviceDriverEnum {
   DEVICEDRIVER_TRANSPORT_API = 2;
   DEVICEDRIVER_P4 = 3;
   DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;
-  DEVICEDRIVER_ONF_TR_352 = 5;
+  DEVICEDRIVER_ONF_TR_532 = 5;
   DEVICEDRIVER_XR = 6;
   DEVICEDRIVER_IETF_L2VPN = 7;
   DEVICEDRIVER_GNMI_OPENCONFIG = 8;
+  DEVICEDRIVER_OPTICAL_TFS = 9;
+  DEVICEDRIVER_IETF_ACTN = 10;
+  DEVICEDRIVER_OC = 11;
 }
 
 enum DeviceOperationalStatusEnum {
@@ -231,10 +249,16 @@ message LinkId {
   Uuid link_uuid = 1;
 }
 
+message LinkAttributes {
+  float total_capacity_gbps = 1;
+  float used_capacity_gbps  = 2;
+}
+
 message Link {
   LinkId link_id = 1;
   string name = 2;
   repeated EndPointId link_endpoint_ids = 3;
+  LinkAttributes attributes = 4;
 }
 
 message LinkIdList {
@@ -274,6 +298,8 @@ enum ServiceTypeEnum {
   SERVICETYPE_L2NM = 2;
   SERVICETYPE_TAPI_CONNECTIVITY_SERVICE = 3;
   SERVICETYPE_TE = 4;
+  SERVICETYPE_E2E = 5;
+  SERVICETYPE_OPTICAL_CONNECTIVITY = 6;
 }
 
 enum ServiceStatusEnum {
@@ -598,3 +624,53 @@ message AuthenticationResult {
   ContextId context_id = 1;
   bool authenticated = 2;
 }
+
+// ---------------- Experimental ------------------------
+message OpticalConfigId {
+  string opticalconfig_uuid = 1;
+}
+message OpticalConfig {
+  OpticalConfigId opticalconfig_id = 1;
+  string config = 2;
+}
+
+message OpticalConfigList {
+  repeated OpticalConfig opticalconfigs = 1;
+}
+
+// ---- Optical Link ----
+
+message OpticalLinkId {
+  Uuid optical_link_uuid = 1;
+}
+
+message FiberId {
+  Uuid fiber_uuid = 1;
+}
+
+message Fiber {
+  string ID = 10;
+  string src_port = 1;
+  string dst_port = 2;
+  string local_peer_port =  3;
+  string remote_peer_port = 4;
+  repeated int32 c_slots = 5;
+  repeated int32 l_slots = 6;
+  repeated int32 s_slots = 7;
+  float length = 8;
+  bool used = 9;
+  FiberId fiber_uuid = 11;
+ 
+}
+message OpticalLinkDetails {
+  float length = 1;
+  string source = 2;
+  string target = 3;
+  repeated Fiber fibers = 4;
+}
+
+message OpticalLink {
+  string name = 1;
+  OpticalLinkDetails details = 2;
+  OpticalLinkId optical_link_uuid = 3;
+}

proto/context_policy.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/dbscanserving.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/device.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/distributed_cybersecurity.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/dlt_connector.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.

proto/dlt_gateway.proto

-// Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/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.