Commit 9bf79402 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

First Round Cleaning For Merge

parent e8b49b4b

manifests/opticalcontrollerservice.yaml

+1 −3
Original line number Diff line number Diff line
@@ -9,9 +9,7 @@ spec: 
  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:

start_topo.sh→ofc24/start_topo.sh

+0 −0

File moved.

View file

proto/context.proto

+13 −11
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ service ContextService { 


 

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

  rpc GetMyConfig (Empty ) returns ( MyConfigList ) {}

  rpc SetMyConfig (MyConfig) returns (MyConfigId) {}

  rpc SelectMyConfig (MyConfigId) returns (MyConfig) {}

  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) {}
@@ -211,9 +211,11 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_OC = 11;

  DEVICEDRIVER_FLEXSCALE=10;

  DEVICEDRIVER_IETF_ACTN=9;

  DEVICEDRIVER_FLEXSCALE=10;

  DEVICEDRIVER_OC = 11;

 

 

}



enum DeviceOperationalStatusEnum {
@@ -626,15 +628,15 @@ message AuthenticationResult { 
}



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

message MyConfigId {

  string myconfig_uuid= 1;

message OpticalConfigId {

  string opticalconfig_uuid= 1;

}

message MyConfig {

  MyConfigId myconfig_id=1;

message OpticalConfig {

  OpticalConfigId opticalconfig_id=1;

  string config =2 ;

}

message MyConfigList {

  repeated MyConfig MyConfigs =1 ;

message OpticalConfigList {

  repeated OpticalConfig opticalconfigs =1 ;

}

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

message OpticalLinkId {

proto/openconfig_device.proto

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ import "context.proto"; 
import "monitoring.proto";



service OpenConfigService {

  rpc AddOpenConfigDevice       (context.MyConfig    ) returns (context.MyConfigId    ) {}

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

 

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

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



}