Commit 65563851 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/125-cnit-integrate-leftover-common-contributions-related-to-optical-controller-component' into 'develop'

Resolve "(CNIT) Integrate leftover common contributions related to Optical Controller component"

See merge request !212
parents e1958317 9bbd8850

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

proto/context.proto

+62 −0
Original line number Diff line number Diff line
@@ -74,6 +74,16 @@ service ContextService { 
  rpc SetConnection      (Connection    ) returns (       ConnectionId    ) {}

  rpc RemoveConnection   (ConnectionId  ) returns (       Empty           ) {}

  rpc GetConnectionEvents(Empty         ) returns (stream ConnectionEvent ) {}



 

  // ------------------------------ Experimental -----------------------------

  rpc GetOpticalConfig   (Empty          ) returns (OpticalConfigList     ) {}

  rpc SetOpticalConfig   (OpticalConfig  ) returns (OpticalConfigId       ) {}

  rpc SelectOpticalConfig(OpticalConfigId) returns (OpticalConfig         ) {}



  rpc SetOpticalLink     (OpticalLink    ) returns (Empty                 ) {}

  rpc GetOpticalLink     (OpticalLinkId  ) returns (OpticalLink           ) {}

  rpc GetFiber           (FiberId        ) returns (Fiber                 ) {}

}



// ----- Generic -------------------------------------------------------------------------------------------------------
@@ -203,6 +213,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_FLEXSCALE = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

}



enum DeviceOperationalStatusEnum {
@@ -288,6 +299,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_TAPI_CONNECTIVITY_SERVICE = 3;

  SERVICETYPE_TE = 4;

  SERVICETYPE_E2E = 5;

  SERVICETYPE_OPTICAL_CONNECTIVITY = 6;

}



enum ServiceStatusEnum {
@@ -612,3 +624,53 @@ message AuthenticationResult { 
  ContextId context_id = 1;

  bool authenticated = 2;

}



// ---------------- Experimental ------------------------

message OpticalConfigId {

  string opticalconfig_uuid = 1;

}

message OpticalConfig {

  OpticalConfigId opticalconfig_id = 1;

  string config = 2;

}



message OpticalConfigList {

  repeated OpticalConfig opticalconfigs = 1;

}



// ---- Optical Link ----



message OpticalLinkId {

  Uuid optical_link_uuid = 1;

}



message FiberId {

  Uuid fiber_uuid = 1;

}



message Fiber {

  string ID = 10;

  string src_port = 1;

  string dst_port = 2;

  string local_peer_port =  3;

  string remote_peer_port = 4;

  repeated int32 c_slots = 5;

  repeated int32 l_slots = 6;

  repeated int32 s_slots = 7;

  float length = 8;

  bool used = 9;

  FiberId fiber_uuid = 11;

 

}

message OpticalLinkDetails {

  float length = 1;

  string source = 2;

  string target = 3;

  repeated Fiber fibers = 4;

}



message OpticalLink {

  string name = 1;

  OpticalLinkDetails details = 2;

  OpticalLinkId optical_link_uuid = 3;

}