Merge branch... (6bdd4ce7) · Commits · TFS / controller

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

proto/osm_client.proto

0 → 100644

+71 −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.

		syntax = "proto3";
		package osmClient;

		import "context.proto";

		service OsmService {
		rpc NsiCreate (CreateRequest) returns(CreateResponse) {}
		rpc NsiList (context.Empty) returns(NsiListResponse) {}
		rpc NsiGet (GetRequest) returns(GetResponse) {}
		rpc NsiDelete (DeleteRequest) returns(DeleteResponse) {}
		}

		message CreateRequest {
		string nst_name = 1;
		string nsi_name = 2;
		string config = 3;
		string ssh_key = 4;
		string account = 5;
		}

		//OSM library doesn't return nsi ID, just an exception
		message CreateResponse {
		bool succeded = 1;
		string errormessage = 2;
		}

		message NsiListResponse {
		repeated string id = 1;
		}

		message GetRequest {
		string id = 1;
		}

		message GetResponse {
		NsiObject nsi = 1;
		}

		message NsiObject {
		string nst_name = 1;
		string nsi_name = 2;
		string description = 3;
		string VimAccountId = 4;
		string Netslice_Subnet_id = 5;
		string Netslice_vld_ip = 6;
		}

		message DeleteRequest {
		string id = 1;
		}

		//OSM library doesn't return nsi ID, just an exception
		message DeleteResponse {
		bool succeded = 1;
		string errormessage = 2;
		}

src/common/Constants.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ class ServiceNameEnum(Enum):
		ANALYTICS = 'analytics'
		ANALYTICSBACKEND = 'analytics-backend'
		QOSPROFILE = 'qos-profile'
		OSMCLIENT = 'osm-client'

		# Used for test and debugging only
		DLT_GATEWAY = 'dltgateway'
		@@ -112,6 +113,7 @@ DEFAULT_SERVICE_GRPC_PORTS = {
		ServiceNameEnum.ANALYTICS .value : 30080,
		ServiceNameEnum.ANALYTICSBACKEND .value : 30090,
		ServiceNameEnum.AUTOMATION .value : 30200,
		ServiceNameEnum.OSMCLIENT .value : 30210,

		# Used for test and debugging only
		ServiceNameEnum.DLT_GATEWAY .value : 50051,

src/osm_client/Config.py

0 → 100644

+18 −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.

		from common.Settings import get_setting

		DEFAULT_OSM_ADDRESS = '127.0.0.1'
		OSM_ADDRESS = get_setting('OSM_ADDRESS', default=DEFAULT_OSM_ADDRESS)

src/osm_client/Dockerfile

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.

		FROM python:3.10.16-slim


		# Install dependencies
		RUN apt-get --yes --quiet --quiet update
		RUN apt-get --yes --quiet --quiet install wget g++ git build-essential cmake make git \
		libpcre2-dev python3-dev python3-pip python3-cffi curl software-properties-common && \
		rm -rf /var/lib/apt/lists/*

		# Set Python to show logs as they occur
		ENV PYTHONUNBUFFERED=0


		# Download the gRPC health probe
		RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
		wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
		chmod +x /bin/grpc_health_probe

		# Get generic Python packages
		RUN python3 -m pip install --upgrade pip
		RUN python3 -m pip install --upgrade setuptools wheel
		RUN python3 -m pip install --upgrade pip-tools

		# Get common Python packages
		# Note: this step enables sharing the previous Docker build steps among all the Python components
		WORKDIR /var/teraflow
		COPY common_requirements.in common_requirements.in
		RUN pip-compile --quiet --output-file=common_requirements.txt common_requirements.in
		RUN python3 -m pip install -r common_requirements.txt

		# Add common files into working directory
		WORKDIR /var/teraflow/common
		COPY src/common/. ./
		RUN rm -rf proto

		# Create proto sub-folder, copy .proto files, and generate Python code
		RUN mkdir -p /var/teraflow/common/proto
		WORKDIR /var/teraflow/common/proto
		RUN touch __init__.py
		COPY proto/*.proto ./
		RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto
		RUN rm *.proto
		RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;

		# Create component sub-folders
		RUN mkdir -p /var/teraflow/osm_client
		WORKDIR /var/teraflow/osm_client
		ENV OSM_CLIENT_VERSION=v16.0
		RUN python3 -m pip install -r "https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=${OSM_CLIENT_VERSION}"
		RUN python3 -m pip install "git+https://osm.etsi.org/gerrit/osm/IM.git@${OSM_CLIENT_VERSION}#egg=osm-im" --upgrade
		#Clone OsmCLient code
		RUN git clone https://osm.etsi.org/gerrit/osm/osmclient
		RUN git -C osmclient checkout ${OSM_CLIENT_VERSION}
		# Install osmClient using pip
		RUN python3 -m pip install -r osmclient/requirements.txt
		RUN python3 -m pip install ./osmclient

		# Add component files into working directory
		WORKDIR /var/teraflow
		COPY src/osm_client/. osm_client/

		# Start the service
		ENTRYPOINT ["python", "-m", "osm_client.service"]