Resolve: "(CNIT) Multi-Granular Optical Nodes and Optical Transpoders management"

Closes #108 (closed) and #153 (closed)

proto/context.proto

@@ -77,14 +77,20 @@ service ContextService {
 
  
   // ------------------------------ Experimental -----------------------------
-  rpc GetOpticalConfig   (Empty          ) returns (OpticalConfigList     ) {}
-  rpc SetOpticalConfig   (OpticalConfig  ) returns (OpticalConfigId       ) {}
-  rpc SelectOpticalConfig(OpticalConfigId) returns (OpticalConfig         ) {}
+  rpc GetOpticalConfig        (Empty             )    returns    (     OpticalConfigList  ) {}
+  rpc SetOpticalConfig        (OpticalConfig     )    returns    (     OpticalConfigId    ) {}
+  rpc UpdateOpticalConfig     (OpticalConfig     )    returns    (     OpticalConfigId    ) {}
+  rpc SelectOpticalConfig     (OpticalConfigId   )    returns    (     OpticalConfig      ) {}
+  rpc DeleteOpticalConfig     (OpticalConfigId   )    returns    (     Empty              ) {}
+  rpc DeleteOpticalChannel    (OpticalConfig     )    returns    (     Empty              ) {}
 
-  rpc SetOpticalLink     (OpticalLink    ) returns (Empty                 ) {}
-  rpc GetOpticalLink     (OpticalLinkId  ) returns (OpticalLink           ) {}
-  rpc GetFiber           (FiberId        ) returns (Fiber                 ) {}
-}
+  rpc SetOpticalLink          (OpticalLink       )    returns (        Empty               ) {}
+  rpc GetOpticalLink          (LinkId            )    returns (        OpticalLink         ) {}
+  rpc DeleteOpticalLink       (LinkId            )    returns (        Empty               ) {}
+  rpc GetOpticalLinkList      (Empty             )    returns (        OpticalLinkList     ) {}
+
+  rpc DeleteServiceConfigRule (ServiceConfigRule )    returns (         Empty              ) {}
+ }
 
 // ----- Generic -------------------------------------------------------------------------------------------------------
 message Empty {}
@@ -148,6 +154,8 @@ message Topology {
   string name = 2;
   repeated DeviceId device_ids = 3;
   repeated LinkId link_ids = 4;
+
+  repeated LinkId optical_link_ids=5;
 }
 
 message TopologyDetails {
@@ -155,6 +163,8 @@ message TopologyDetails {
   string name = 2;
   repeated Device devices = 3;
   repeated Link links = 4;
+  
+  repeated OpticalLink optical_links =5 ;
 }
 
 message TopologyIdList {
@@ -311,6 +321,7 @@ enum ServiceStatusEnum {
   SERVICESTATUS_UPDATING = 3;
   SERVICESTATUS_PENDING_REMOVAL = 4;
   SERVICESTATUS_SLA_VIOLATED = 5;
+
 }
 
 message ServiceStatus {
@@ -645,45 +656,58 @@ message OpticalConfigId {
 message OpticalConfig {
   OpticalConfigId opticalconfig_id = 1;
   string config = 2;
+  DeviceId device_id = 3;
 }
 
 message OpticalConfigList {
   repeated OpticalConfig opticalconfigs = 1;
 }
 
+message OpticalConfigEvent {
+  Event event = 1;
+  OpticalConfigId opticalconfig_id = 2;
+}
+
+
 // ---- Optical Link ----
 
-message OpticalLinkId {
-  Uuid optical_link_uuid = 1;
+message OpticalEndPointId {
+  
+  DeviceId device_id = 2;
+  Uuid endpoint_uuid = 3;
 }
 
-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 OpticalLinkList {
+  repeated OpticalLink optical_links = 1;
 }
+
+
+
 message OpticalLinkDetails {
   float length = 1;
-  string source = 2;
-  string target = 3;
-  repeated Fiber fibers = 4;
+  string src_port = 2;
+  string dst_port = 3;
+  string local_peer_port = 4;
+  string remote_peer_port = 5 ;
+  bool used = 6 ; 
+  map< string ,int32 > c_slots = 7;
+  map< string ,int32 > l_slots = 8;
+  map< string ,int32 > s_slots = 9;
 }
 
 message OpticalLink {
   string name = 1;
-  OpticalLinkDetails details = 2;
-  OpticalLinkId optical_link_uuid = 3;
+  OpticalLinkDetails optical_details = 2;
+  LinkId link_id = 3;
+ repeated EndPointId link_endpoint_ids=4;
 }
+
+
+
+////////////////// Config Rule Delete ////////////
+
+message ServiceConfigRule {
+  ServiceId service_id =1;
+  ConfigRule_Custom configrule_custom =2;
+}
\ No newline at end of file