Commit b6c402e1 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'feat/tid-pcep' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'feat/tid-pcep' of https://labs.etsi.org/rep/tfs/controller into feat/tid-new-pcep-component
parents d7c899e9 8463e6d2

manifests/pcepservice.yaml

+0 −19
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ spec: 
            cpu: 500m

            memory: 512Mi

---

#Internal ClusterIP service

apiVersion: v1

kind: Service

metadata:
@@ -83,21 +82,3 @@ spec: 
    protocol: TCP

    port: 6666

    targetPort: 6666
 


#NodePortService

# apiVersion: v1

# kind: Service

# metadata:

#   name: pceservice-ext

#   labels:

#     app: pceservice

# spec:

#   type: NodePort

#   externalTrafficPolicy: Local

#   selector:

#     app: pceservice

#   ports:

#   - name: pcep

#     protocol: TCP

#     port: 4189

#     targetPort: 4189

proto/pcep.proto

0 → 100644
+40 −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 pcep;





service PcepService {

  rpc sendRequest    ( RequestRq ) returns (       RequestRp      ) {}

  rpc configuratePCE ( PceIpRq   ) returns (       PceIpRp      ) {}

}



message RequestRq {

  string command = 1;

}



message RequestRp {

  string commandRp = 1;

}



message PceIpRq {

  string address=1;

  string port= 2;

  string asNumber=3;

}



message PceIpRp{

  string addressRp=1;

}

scripts/show_logs_pcep.sh

0 → 100755
+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/pcepservice -c server

src/common/Constants.py

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ class ServiceNameEnum(Enum): 
    OPTICALATTACKDETECTOR  = 'opticalattackdetector'

    OPTICALATTACKMITIGATOR = 'opticalattackmitigator'

    CACHING                = 'caching'

    PCEP                   = 'pcep'

    TE                     = 'te'

    FORECASTER             = 'forecaster'

    E2EORCHESTRATOR        = 'e2e-orchestrator'
@@ -93,6 +94,7 @@ DEFAULT_SERVICE_GRPC_PORTS = { 
    ServiceNameEnum.OPTICALATTACKMANAGER   .value : 10005,

    ServiceNameEnum.INTERDOMAIN            .value : 10010,

    ServiceNameEnum.PATHCOMP               .value : 10020,

    ServiceNameEnum.PCEP                   .value : 10050,

    ServiceNameEnum.TE                     .value : 10030,

    ServiceNameEnum.FORECASTER             .value : 10040,

    ServiceNameEnum.E2EORCHESTRATOR        .value : 10050,

src/device/service/driver_api/_Driver.py

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ RESOURCE_NETWORK_INSTANCES = '__network_instances__' 
RESOURCE_ROUTING_POLICIES = '__routing_policies__'

RESOURCE_SERVICES = '__services__'

RESOURCE_ACL = '__acl__'

RESOURCE_INVENTORY = '__inventory__'





class _Driver:

    def __init__(self, name : str, address: str, port: int, **settings) -> None: