Commit 99cffbd4 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code clean up

parent 4c69ebbb

src/device/service/driver_api/_Driver.py

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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:

src/pcep/service/PcepServiceServicerImpl.py

+3 −3
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ class PcepServiceServicerImpl(PcepServiceServicer): 
    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def configuratePCE(self, request : PceIpRq, context : grpc.ServicerContext) -> PceIpRp:

        LOGGER.debug("(ConfiguratePCE) Create pce instance %s",request)

        # configurateIP=self.pcepServer.connectToJavaPcep(request.address)

        #return PceIpRp(addressRp=configurateIP)

        return PceIpRp(addressRp="127.0.0.1")

        configurateIP=self.pcepServer.connectToJavaPcep(request.address)

        return PceIpRp(addressRp=configurateIP)

        #return PceIpRp(addressRp="10.95.90.56")

    

    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def sendRequest(self, request : RequestRq, context : grpc.ServicerContext) -> RequestRp:

src/pcep/service/resources/PCEServerConfiguration.xml

+1 −14
Original line number Diff line number Diff line 
 <!-- Copyright 2022-2024 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. -->



<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<config>

	<PCEServerPort>4189</PCEServerPort>
@@ -19,6 +5,7 @@ 
	<!--<LocalPCEAddress>192.168.1.200</LocalPCEAddress>-->

	<!-- <LocalPCEAddress>127.0.0.1</LocalPCEAddress> -->

	<!-- <LocalPCEAddress>192.168.165.172</LocalPCEAddress> -->

	<!-- LocalPCEAddress>192.168.165.88</LocalPCEAddress>-->

	<LocalPCEAddress>0.0.0.0</LocalPCEAddress>



	<ConnectTimer>

src/pcep/service/resources/log4j2.xml

+16 −30
Original line number Diff line number Diff line 
 <!-- Copyright 2022-2024 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. -->

 

<?xml version="1.0" encoding="UTF-8"?>

<Configuration status="DEBUG">

  <Appenders>

src/pcep/service/resources/topologia_ifusion.xml

+1 −15
Original line number Diff line number Diff line 
 <!-- Copyright 2022-2024 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. -->

 

<?xml version="1.0" encoding="UTF-8"?>

<network>

	<domain>