Commit d0ad76d7 authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

Merge branch 'develop' into... 

Merge branch 'develop' into feat/113-cttc-implement-nbi-connector-to-manage-network-access-control-lists-acls
parents ef19aedc cbb89cbb

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ include: 
  - local: '/src/ztp/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/forecaster/.gitlab-ci.yml'

  - local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

deploy/tfs.sh

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    echo "Waiting for '$COMPONENT' component..."

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=300s deployment/${COMPONENT_OBJNAME}service

        --for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service

    printf "\n"

done

manifests/opticalcontrollerservice.yaml

0 → 100644
+72 −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.



apiVersion: apps/v1

kind: Deployment

metadata:

  name: opticalcontrollerservice

spec:

  selector:

    matchLabels:

      app: opticalcontrollerservice

  replicas: 1

  template:

    metadata:

      labels:

        app: opticalcontrollerservice

    spec:

      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image:  localhost:32000/tfs/opticalcontroller:dev

        imagePullPolicy: Never

        ports:

        - containerPort: 10060

        - containerPort: 9192

        env:

        - name: LOG_LEVEL

          value: "INFO"

        #readinessProbe:

        #  exec:

        #    command: ["/bin/grpc_health_probe", "-addr=:10060"]

        #livenessProbe:

        #  exec:

        #    command: ["/bin/grpc_health_probe", "-addr=:10060"]

        resources:

          requests:

            cpu: 500m

            memory: 128Mi

          limits:

            cpu: 1000m

            memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: opticalcontrollerservice

  labels:

    app: opticalcontrollerservice

spec:

  type: ClusterIP

  selector:

    app: opticalcontrollerservice

  ports:

  - name: grpc

    protocol: TCP

    port: 10060

    targetPort: 10060

  - name: metrics

    protocol: TCP

    port: 9192

    targetPort: 9192

my_deploy.sh

+4 −1
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene 
# Uncomment to activate Monitoring

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"



# Uncomment to activate bgpls_speaker

# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"



# Uncomment to activate Optical Controller

#export TFS_COMPONENTS="${TFS_COMPONENTS} opticalcontroller"



# Uncomment to activate ZTP

#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"

ofc24

0 → 120000
+1 −0
Original line number Diff line number Diff line 
src/tests/ofc24/
 
 No newline at end of file