Commit 6350af81 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

added testing files and info

parents 6220b5d5 d5bb84dd

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=90s deployment/${COMPONENT_OBJNAME}service

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

    printf "\n"

done

manifests/opticalcontrollerservice.yaml

+39 −22
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:
@@ -9,7 +23,6 @@ spec: 
  replicas: 1

  template:

    metadata:

     

      labels:

        app: opticalcontrollerservice

    spec:
@@ -19,13 +32,17 @@ spec: 
        image:  localhost:32000/tfs/opticalcontroller:dev

        imagePullPolicy: Never

        ports:

         - containerPort: 5022

        - 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
@@ -47,8 +64,8 @@ spec: 
  ports:

  - name: grpc

    protocol: TCP

    port: 5022

    targetPort: 5022

    port: 10060

    targetPort: 10060

  - name: metrics

    protocol: TCP

    port: 9192

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

+37 −35
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ service ContextService { 
  rpc GetConnectionEvents(Empty         ) returns (stream ConnectionEvent ) {}



 

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

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

  rpc GetOpticalConfig   (Empty          ) returns (OpticalConfigList     ) {}

  rpc SetOpticalConfig   (OpticalConfig  ) returns (OpticalConfigId       ) {}

  rpc SelectOpticalConfig(OpticalConfigId) returns (OpticalConfig         ) {}
@@ -211,11 +211,9 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_IETF_ACTN=9;

  DEVICEDRIVER_FLEXSCALE=10;

  DEVICEDRIVER_FLEXSCALE = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

 

 

}



enum DeviceOperationalStatusEnum {
@@ -635,10 +633,13 @@ message OpticalConfig { 
  OpticalConfigId opticalconfig_id = 1;

  string config = 2;

}



message OpticalConfigList {

  repeated OpticalConfig opticalconfigs = 1;

}



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



message OpticalLinkId {

  Uuid optical_link_uuid = 1;

}
@@ -646,6 +647,7 @@ message OpticalLinkId { 
message FiberId {

  Uuid fiber_uuid = 1;

}



message Fiber {

  string ID = 10;

  string src_port = 1;
@@ -668,7 +670,7 @@ message OpticalLinkDetails { 
}



message OpticalLink {

  OpticalLinkId optical_link_uuid=3;

  string name = 1;

  OpticalLinkDetails details = 2;

  OpticalLinkId optical_link_uuid = 3;

}

proto/openconfig_device.proto

+2 −5
Original line number Diff line number Diff line
@@ -16,11 +16,8 @@ syntax = "proto3"; 
package openconfig_device;



import "context.proto";

import "monitoring.proto";



service OpenConfigService {

  rpc AddOpenConfigDevice   (context.OpticalConfig) returns (context.OpticalConfigId) {}

 

  rpc ConfigureOpticalDevice(context.OpticalConfig) returns (context.Empty          ) {}



}