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

Merge branch... 

Merge branch 'feat/314-tid-new-service-for-ipowdm-configuration-fron-orchestrator-to-ipowdm-controller' into 'develop'

Resolve "(TID) New service for IPoWDM configuration fron Orchestrator to IPoWDM controller"

See merge request !377
parents 069da855 a161b81e

proto/context.proto

+22 −6
Original line number Original line Diff line number Diff line
@@ -19,8 +19,10 @@ package context; 
import "google/protobuf/any.proto";

import "google/protobuf/any.proto";





import "acl.proto";

import "acl.proto";

import "ipowdm.proto";

import "ip_link.proto";

import "ip_link.proto";

import "kpi_sample_types.proto";

import "kpi_sample_types.proto";

import "tapi_lsp.proto";





service ContextService {

service ContextService {

  rpc ListContextIds     (Empty         ) returns (       ContextIdList   ) {}

  rpc ListContextIds     (Empty         ) returns (       ContextIdList   ) {}
@@ -354,6 +356,8 @@ enum ServiceTypeEnum { 
  SERVICETYPE_INT = 9;

  SERVICETYPE_INT = 9;

  SERVICETYPE_ACL = 10;

  SERVICETYPE_ACL = 10;

  SERVICETYPE_IP_LINK = 11;

  SERVICETYPE_IP_LINK = 11;

  SERVICETYPE_TAPI_LSP = 12;

  SERVICETYPE_IPOWDM = 13;

}

}





enum ServiceStatusEnum {

enum ServiceStatusEnum {
@@ -567,6 +571,16 @@ message ConfigRule_ACL { 
  acl.AclRuleSet rule_set = 2;

  acl.AclRuleSet rule_set = 2;

}

}





message ConfigRule_IPOWDM {

  EndPointId endpoint_id        = 1;

  ipowdm.IpowdmRuleSet rule_set = 2;

}



message ConfigRule_TAPI_LSP {

  EndPointId endpoint_id           = 1;

  repeated tapi_lsp.TapiLspRuleSet rule_set = 2;

}



message ConfigRule_IP_LINK {

message ConfigRule_IP_LINK {

  EndPointId endpoint_id           = 1;

  EndPointId endpoint_id           = 1;

  ip_link.IpLinkRuleSet rule_set = 2;

  ip_link.IpLinkRuleSet rule_set = 2;
@@ -578,6 +592,8 @@ message ConfigRule { 
    ConfigRule_Custom custom = 2;

    ConfigRule_Custom custom = 2;

    ConfigRule_ACL acl = 3;

    ConfigRule_ACL acl = 3;

    ConfigRule_IP_LINK ip_link = 4;

    ConfigRule_IP_LINK ip_link = 4;

    ConfigRule_TAPI_LSP tapi_lsp = 5;

    ConfigRule_IPOWDM ipowdm = 6;

  }

  }

}

}

proto/ipowdm.proto

0 → 100644
+54 −0
Original line number Original line Diff line number Diff line 
// Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (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 ipowdm;



message RuleEndpoint {

    string uuid = 1;

    string ip_address = 2;

    string ip_mask = 3;

    int32 vlan_id = 4;

}



message DigitalSubCarrierId {

    int32 sub_carrier_id = 1;

    string active = 2;

}



message DigitalSubCarriersGroup {

    int32 digital_sub_carriers_group_id = 1;

    repeated DigitalSubCarrierId digital_sub_carrier_id = 4;

}



message Component {

    string name = 1;

    float frequency = 2;

    float target_output_power = 3;

    int32 operational_mode = 4;

    repeated DigitalSubCarriersGroup digital_sub_carriers_group = 5;

    string operation = 6;

}



message Transceiver {

    repeated Component components = 1;

}



message IpowdmRuleSet {

    repeated RuleEndpoint src = 1;

    repeated RuleEndpoint dst = 2;

    int32 bw = 3;

    string uuid = 4;

    Transceiver transceiver = 5;

}

proto/tapi_lsp.proto

0 → 100644
+36 −0
Original line number Original line Diff line number Diff line 
// Copyright 2022-2025 ETSI OSG/SDG TeraFlowSDN (TFS) (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 tapi_lsp;



message TapiLspRuleSet {

  string  input_sip   = 1;

  string  output_sip  = 2;

  string  uuid = 3;

  string  bw   = 4;

  string  tenant_uuid = 5;

  string  layer_protocol_name = 6;

  string  layer_protocol_qualifier = 7;

  string  lower_frequency_mhz = 8;

  string  upper_frequency_mhz = 9;

  repeated string link_uuid_path = 10;

  string  granularity    = 11;

  string  grid_type      = 12;

  string  direction      = 13;

  string capacity_unit   = 14;

  string capacity_value  = 15;

  string route_objective_function = 16;

  string url = 17;

}

src/analytics/backend/Dockerfile

+3 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,9 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \ 
    chmod +x /bin/grpc_health_probe

    chmod +x /bin/grpc_health_probe





# Get generic Python packages

# Get generic Python packages

RUN python3 -m pip install --upgrade pip

RUN python3 -m pip install --upgrade 'pip==25.2'

RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'

RUN python3 -m pip install --upgrade pip-tools

RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'





# Get common Python packages

# Get common Python packages

# Note: this step enables sharing the previous Docker build steps among all the Python components

# Note: this step enables sharing the previous Docker build steps among all the Python components

src/analytics/frontend/Dockerfile

+3 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,9 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \ 
    chmod +x /bin/grpc_health_probe

    chmod +x /bin/grpc_health_probe





# Get generic Python packages

# Get generic Python packages

RUN python3 -m pip install --upgrade pip

RUN python3 -m pip install --upgrade 'pip==25.2'

RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'

RUN python3 -m pip install --upgrade pip-tools

RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'





# Get common Python packages

# Get common Python packages

# Note: this step enables sharing the previous Docker build steps among all the Python components

# Note: this step enables sharing the previous Docker build steps among all the Python components