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

Optical component: 

- Pre-merge cleanup
parent 34f9f95a

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         ) {}
@@ -214,8 +214,6 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_IETF_ACTN = 9;

  DEVICEDRIVER_FLEXSCALE = 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 −4
Original line number Diff line number Diff line
@@ -20,7 +20,5 @@ import "monitoring.proto"; 


service OpenConfigService {

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

 

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



}

scripts/show_logs_opticalcontroller.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 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 
kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/opticalcontrollerservice -c server

src/common/DeviceTypes.py

+0 −1
Original line number Diff line number Diff line
@@ -48,6 +48,5 @@ class DeviceTypeEnum(Enum): 
    PACKET_SWITCH                   = 'packet-switch'

    XR_CONSTELLATION                = 'xr-constellation'





    # ETSI TeraFlowSDN controller

    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'