Commit e8b49b4b authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

leftover contribution

parent e1958317
Loading
Loading
Loading
Loading
+57 −0
Original line number Diff line number Diff line
apiVersion: apps/v1
kind: Deployment
metadata:
  name: opticalcontrollerservice
spec:
  selector:
    matchLabels:
      app: opticalcontrollerservice
  replicas: 1
  template:
    metadata:
      annotations:
        # Required for IETF L2VPN SBI when both parent and child run in same K8s cluster with Linkerd
        config.linkerd.io/skip-outbound-ports: "8022"
      labels:
        app: opticalcontrollerservice
    spec:
      terminationGracePeriodSeconds: 5
      containers:
       - name: server
         image:  localhost:32000/tfs/opticalcontroller:dev
         imagePullPolicy: Never
         ports:
         - containerPort: 5022
         - containerPort: 9192
        
         env:
         - name: LOG_LEVEL
           value: "INFO"

         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: 5022
    targetPort: 5022
  - name: metrics
    protocol: TCP
    port: 9192
    targetPort: 9192
+2 −5
Original line number Diff line number Diff line
@@ -20,13 +20,10 @@
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 load_generator"
export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice  webui "

# Uncomment to activate Monitoring
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

# Uncomment to activate bgpls_speaker
#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"../

# Uncomment to activate ZTP
#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
+60 −2
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 GetMyConfig (Empty ) returns ( MyConfigList ) {}
  rpc SetMyConfig (MyConfig) returns (MyConfigId) {}
  rpc SelectMyConfig (MyConfigId) returns (MyConfig) {}

  rpc SetOpticalLink (OpticalLink) returns (Empty) {}
  rpc GetOpticalLink (OpticalLinkId) returns (OpticalLink) {}
  rpc GetFiber (FiberId) returns (Fiber) {}
}

// ----- Generic -------------------------------------------------------------------------------------------------------
@@ -201,8 +211,9 @@ enum DeviceDriverEnum {
  DEVICEDRIVER_XR = 6;
  DEVICEDRIVER_IETF_L2VPN = 7;
  DEVICEDRIVER_GNMI_OPENCONFIG = 8;
  DEVICEDRIVER_FLEXSCALE = 9;
  DEVICEDRIVER_IETF_ACTN = 10;
  DEVICEDRIVER_OC = 11;
  DEVICEDRIVER_FLEXSCALE=10;
  DEVICEDRIVER_IETF_ACTN=9;
}

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,49 @@ message AuthenticationResult {
  ContextId context_id = 1;
  bool authenticated = 2;
}

// ---------------- Experimental ------------------------
message MyConfigId {
  string myconfig_uuid= 1;
}
message MyConfig {
  MyConfigId myconfig_id=1;
  string config =2 ;
}
message MyConfigList {
  repeated MyConfig MyConfigs =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 {
  OpticalLinkId optical_link_uuid=3;
  string name=1;
  OpticalLinkDetails details=2;
}
+26 −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.

syntax = "proto3";
package openconfig_device;

import "context.proto";
import "monitoring.proto";

service OpenConfigService {
  rpc AddOpenConfigDevice       (context.MyConfig    ) returns (context.MyConfigId    ) {}
 
  rpc ConfigureOpticalDevice (context.MyConfig) returns (context.Empty) {}

}
+27 −0
Original line number Diff line number Diff line
#!/bin/bash
# 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.

########################################################################################################################
# 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/opticalcontrollerservice -c server > logs/opticalcontroller.log && vi logs/opticalcontroller.log
Loading