Merge branch 'develop' into... (e8d6a6b1) · Commits · TFS / controller

common_requirements.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		coverage==6.3
		grpcio==1.47.*
		grpcio-health-checking==1.47.*
		grpcio-reflection==1.47.*
		grpcio-tools==1.47.*
		grpclib==0.4.4
		prettytable==3.5.0

manifests/servicemonitors.yaml

+6 −6

Original line number	Diff line number	Diff line
		@@ -575,9 +575,9 @@ apiVersion: monitoring.coreos.com/v1
		kind: ServiceMonitor
		metadata:
		namespace: monitoring # namespace where prometheus is running
		name: tfs-kpi_value_apiservice-metric
		name: tfs-kpi-value-apiservice-metric
		labels:
		app: kpi_value_apiservice
		app: kpi-value-apiservice
		#release: prometheus
		#release: prom # name of the release
		# ( VERY IMPORTANT: You need to know the correct release name by viewing
		@@ -588,7 +588,7 @@ spec:
		matchLabels:
		# Target app service
		#namespace: tfs
		app: kpi_value_apiservice # same as above
		app: kpi-value-apiservice # same as above
		#release: prometheus # same as above
		endpoints:
		- port: metrics # named port in target app
		@@ -604,9 +604,9 @@ apiVersion: monitoring.coreos.com/v1
		kind: ServiceMonitor
		metadata:
		namespace: monitoring # namespace where prometheus is running
		name: tfs-kpi_value_writerservice-metric
		name: tfs-kpi-value-writerservice-metric
		labels:
		app: kpi_value_writerservice
		app: kpi-value-writerservice
		#release: prometheus
		#release: prom # name of the release
		# ( VERY IMPORTANT: You need to know the correct release name by viewing
		@@ -617,7 +617,7 @@ spec:
		matchLabels:
		# Target app service
		#namespace: tfs
		app: kpi_value_writerservice # same as above
		app: kpi-value-writerservice # same as above
		#release: prometheus # same as above
		endpoints:
		- port: metrics # named port in target app

manifests/webuiservice.yaml

+18 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,17 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		apiVersion: v1
		kind: PersistentVolumeClaim
		metadata:
		name: grafana-pvc
		spec:
		accessModes:
		- ReadWriteOnce
		resources:
		requests:
		storage: 1Gi
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -99,6 +110,13 @@ spec:
		limits:
		cpu: 500m
		memory: 1024Mi
		volumeMounts:
		- mountPath: /var/lib/grafana
		name: grafana-pv
		volumes:
		- name: grafana-pv
		persistentVolumeClaim:
		claimName: grafana-pvc
		---
		apiVersion: v1
		kind: Service

proto/context.proto

+11 −11

Original line number	Diff line number	Diff line
		@@ -261,6 +261,14 @@ message LinkId {
		Uuid link_uuid = 1;
		}

		enum LinkTypeEnum {
		LINKTYPE_UNKNOWN = 0;
		LINKTYPE_COPPER = 1;
		LINKTYPE_FIBER = 2;
		LINKTYPE_RADIO = 3;
		LINKTYPE_VIRTUAL = 4;
		}

		message LinkAttributes {
		float total_capacity_gbps = 1;
		float used_capacity_gbps = 2;
		@@ -269,9 +277,9 @@ message LinkAttributes {
		message Link {
		LinkId link_id = 1;
		string name = 2;
		repeated EndPointId link_endpoint_ids = 3;
		LinkAttributes attributes = 4;
		LinkTypeEnum link_type = 5;
		LinkTypeEnum link_type = 3;
		repeated EndPointId link_endpoint_ids = 4;
		LinkAttributes attributes = 5;
		}

		message LinkIdList {
		@@ -287,14 +295,6 @@ message LinkEvent {
		LinkId link_id = 2;
		}

		enum LinkTypeEnum {
		LINKTYPE_UNKNOWN = 0;
		LINKTYPE_COPPER = 1;
		LINKTYPE_VIRTUAL_COPPER = 2;
		LINKTYPE_OPTICAL = 3;
		LINKTYPE_VIRTUAL_OPTICAL = 4;
		}

		// ----- Service -------------------------------------------------------------------------------------------------------
		message ServiceId {
		ContextId context_id = 1;

scripts/grpcurl_inspect_context.sh

0 → 100755

+44 −0

Original line number	Diff line number	Diff line
		#!/bin/bash
		# 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.

		########################################################################################################################
		# Define your deployment settings here
		########################################################################################################################

		# If not already set, set the name of the Kubernetes namespace to deploy to.
		export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}

		########################################################################################################################
		# Automated steps start here
		########################################################################################################################

		# Ref: https://github.com/fullstorydev/grpcurl

		source tfs_runtime_env_vars.sh

		GRPC_ENDPOINT="$CONTEXTSERVICE_SERVICE_HOST:$CONTEXTSERVICE_SERVICE_PORT_GRPC"
		GRP_CURL_CMD="docker run fullstorydev/grpcurl --plaintext $GRPC_ENDPOINT"

		GRPC_SERVICES=`$GRP_CURL_CMD list`
		echo "gRPC Services found in $GRPC_ENDPOINT:"
		printf "\n"

		for GRPC_SERVICE in $GRPC_SERVICES; do
		echo "gRPC Service: $GRPC_SERVICE"
		$GRP_CURL_CMD describe $GRPC_SERVICE
		printf "\n"
		done

		echo "Done!"