Commit ae6b3f12 authored by Mohamad Rahhal's avatar Mohamad Rahhal
Browse files

NBI component - NBI - Connector - OSM Client : 

- Added NBI requirements
parent c0eb5377

manifests/nginx_ingress_http.yaml

+7 −0
Original line number Diff line number Diff line
@@ -106,3 +106,10 @@ spec: 
                name: nbiservice

                port:

                  number: 8080

          - path: /()(osm-api/.*)

            pathType: Prefix

            backend:

              service:

                name: nbiservice

                port:

                  number: 8080

manifests/osm_clientservice.yaml

+11 −11
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: osm_clientservice

  name: osm-clientservice

spec:

  selector:

    matchLabels:

      app: osm_clientservice

      app: osm-clientservice

  #replicas: 1

  template:

    metadata:

      labels:

        app: osm_clientservice

        app: osm-clientservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:
@@ -36,9 +36,9 @@ spec: 
            - containerPort: 9192

          env:

            - name: OSM_ADDRESS

              value: "127.0.0.1"

              value: "10.1.7.199:9999"

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30210"]
@@ -47,22 +47,22 @@ spec: 
              command: ["/bin/grpc_health_probe", "-addr=:30210"]

          resources:

            requests:

              cpu: 250m

              cpu: 150m

              memory: 128Mi

            limits:

              cpu: 1000m

              memory: 1024Mi

              cpu: 500m

              memory: 512Mi

---

apiVersion: v1

kind: Service

metadata:

  name: osm_clientservice

  name: osm-clientservice

  labels:

    app: osm_clientservice

    app: osm-clientservice

spec:

  type: ClusterIP

  selector:

    app: osm_clientservice

    app: osm-clientservice

  ports:

    - name: grpc

      protocol: TCP

my_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
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 nbi webui"

export TFS_COMPONENTS="context device pathcomp service slice nbi webui osm_client"



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -134,7 +134,7 @@ export CRDB_PASSWORD="tfs123" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS=""

export CRDB_DROP_DATABASE_IF_EXISTS="YES"



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""

scripts/show_logs_osm_client.sh

0 → 100755
+27 −0
Original line number Diff line number Diff line 
#!/bin/bash

# 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.



########################################################################################################################

# 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

########################################################################################################################



kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/osm-clientservice -c server
 
 No newline at end of file

src/nbi/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ COPY src/qkd_app/__init__.py qkd_app/__init__.py 
COPY src/qkd_app/client/. qkd_app/client/

COPY src/qos_profile/__init__.py qos_profile/__init__.py

COPY src/qos_profile/client/. qos_profile/client/

COPY src/osm_client/__init__.py osm_client/__init__.py

COPY src/osm_client/client/. osm_client/client/

COPY src/vnt_manager/__init__.py vnt_manager/__init__.py

COPY src/vnt_manager/client/. vnt_manager/client/

RUN mkdir -p /var/teraflow/tests/tools