Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... (d3580fcb) · Commits · TFS / controller

manifests/nginx_ingress_http.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -92,3 +92,10 @@ spec:
		name: nbiservice
		port:
		number: 8080
		- path: /()(agent-probes/.*)
		pathType: Prefix
		backend:
		service:
		name: nbiservice
		port:
		number: 8080

manifests/osm_clientservice.yaml

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		# Copyright 2022-2024 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.

		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: osm_clientservice
		spec:
		selector:
		matchLabels:
		app: osm_clientservice
		#replicas: 1
		template:
		metadata:
		labels:
		app: osm_clientservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: labs.etsi.org:5050/tfs/controller/osm_client:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 30210
		- containerPort: 9192
		env:
		- name: OSM_ADDRESS
		value: "127.0.0.1"
		- name: LOG_LEVEL
		value: "INFO"
		readinessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:30210"]
		livenessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:30210"]
		resources:
		requests:
		cpu: 250m
		memory: 128Mi
		limits:
		cpu: 1000m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: osm_clientservice
		labels:
		app: osm_clientservice
		spec:
		type: ClusterIP
		selector:
		app: osm_clientservice
		ports:
		- name: grpc
		protocol: TCP
		port: 30210
		targetPort: 30210
		- name: metrics
		protocol: TCP
		port: 9192
		targetPort: 9192

manifests/ztp_server.yaml

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		# Copyright 2022-2024 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.

		apiVersion: apps/v1
		kind: Deployment
		metadata:
		name: ztp_serverservice
		spec:
		selector:
		matchLabels:
		app: ztp_serverservice
		#replicas: 1
		template:
		metadata:
		labels:
		app: ztp_serverservice
		spec:
		terminationGracePeriodSeconds: 5
		containers:
		- name: server
		image: labs.etsi.org:5050/tfs/controller/ztp_server:latest
		imagePullPolicy: Always
		ports:
		- containerPort: 8005
		- containerPort: 5051
		- containerPort: 9192
		env:
		- name: LOG_LEVEL
		value: "INFO"
		readinessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:5051"]
		livenessProbe:
		exec:
		command: ["/bin/grpc_health_probe", "-addr=:5051"]
		resources:
		requests:
		cpu: 250m
		memory: 128Mi
		limits:
		cpu: 1000m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: ztp_serverservice
		labels:
		app: ztp_serverservice
		spec:
		type: ClusterIP
		selector:
		app: ztp_serverservice
		ports:
		- name: http
		protocol: TCP
		port: 8005
		targetPort: 8005
		- name: grpc
		protocol: TCP
		port: 5051
		targetPort: 5051
		- name: metrics
		protocol: TCP
		port: 9192
		targetPort: 9192

proto/context.proto

+5 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		syntax = "proto3";
		package context;

		//import "any.proto";
		import "google/protobuf/any.proto";

		import "acl.proto";
		import "kpi_sample_types.proto";

		@@ -226,6 +229,7 @@ enum DeviceDriverEnum {
		DEVICEDRIVER_IETF_L3VPN = 13;
		DEVICEDRIVER_IETF_SLICE = 14;
		DEVICEDRIVER_NCE = 15;
		DEVICEDRIVER_SMARTNIC = 16;
		}

		enum DeviceOperationalStatusEnum {
		@@ -498,6 +502,7 @@ message EndPoint {
		string endpoint_type = 3;
		repeated kpi_sample_types.KpiSampleType kpi_sample_types = 4;
		Location endpoint_location = 5;
		map<string, google.protobuf.Any> capabilities = 6;
		}

		message EndPointName {

proto/context_ext_smartnics.proto

0 → 100644

+99 −0

Original line number	Diff line number	Diff line
		// 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.

		// References:
		// https://www.nvidia.com/content/dam/en-zz/Solutions/networking/ethernet-adapters/connectX-6-dx-datasheet.pdf
		// converged accel: https://www.nvidia.com/content/dam/en-zz/Solutions/gtcf21/converged-accelerator/pdf/datasheet.pdf
		// bluefield-2 = connectX-6 + DPUs
		// conv_accel = bluefield-2 + GPU (A30)

		syntax = "proto3";
		package context_ext_smartnics;

		import "kpi_sample_types.proto";

		message SmartnicsCapabilities {
		string vendor = 1;
		string model = 2;
		string serial_number = 3;
		repeated Transceiver transceivers = 4;
		repeated DPU dpus = 5;
		repeated GPU gpus = 6;
		}

		enum TransceiverPortTypeEnum {
		TRANSCEIVER_PORT_TYPE_UNDEFINED = 0;
		TRANSCEIVER_PORT_TYPE_SFP = 1;
		TRANSCEIVER_PORT_TYPE_SFP_PLUS = 2;
		TRANSCEIVER_PORT_TYPE_QSFP_28 = 3;
		TRANSCEIVER_PORT_TYPE_QSFP_56 = 4;
		TRANSCEIVER_PORT_TYPE_QSFP_DD = 5;
		}

		enum TransceiverPortSpeedEnum {
		TRANSCEIVER_PORT_SPEED_UNDEFINED = 0;
		TRANSCEIVER_PORT_SPEED_1G = 1;
		TRANSCEIVER_PORT_SPEED_10G = 2;
		TRANSCEIVER_PORT_SPEED_25G = 3;
		TRANSCEIVER_PORT_SPEED_40G = 4;
		TRANSCEIVER_PORT_SPEED_100G = 5;
		TRANSCEIVER_PORT_SPEED_200G = 6;
		TRANSCEIVER_PORT_SPEED_400G = 7;
		TRANSCEIVER_PORT_SPEED_800G = 8;
		}

		message Transceiver {
		TransceiverPortTypeEnum port_type = 1;
		repeated TransceiverPortSpeedEnum port_speeds = 2;
		repeated kpi_sample_types.KpiSampleType kpi_sample_types = 3;
		}

		message DPU {
		uint32 num_cores = 1;
		repeated DPU_Core cores = 2;
		repeated DPU_Memory memories = 3;
		}

		enum DpuCoreArchitectureEnum {
		DPU_CORE_ARCHITECTURE_UNDEFINED = 0;
		DPU_CORE_ARCHITECTURE_32BIT = 1;
		DPU_CORE_ARCHITECTURE_64BIT = 2;
		}

		message DPU_Core {
		string model = 1;
		DpuCoreArchitectureEnum architecture = 2;
		uint64 l2_cache_size_mb = 3;
		uint64 l3_cache_size_mb = 4;
		}

		message DPU_Memory {
		string RamMemoryType = 1;
		string eMMCMemoryType = 2;
		uint64 RamMemorySizeGB = 3;
		uint64 eMMCMemorySizeGB = 4;
		}

		message GPU {
		string model = 1;
		string architecture = 2;
		string compute_capabilities = 3;
		uint64 memory_size_gb = 4;
		uint32 num_CUDA_cores = 5;
		uint32 num_Tensor_cores = 6;
		uint32 peak_fp_32 = 7;
		uint32 peak_fp_64 = 8;
		uint32 peak_fp_64_tensor_core = 9;
		}

Admin message