Commit 0618ca07 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

SIMAP Connector: 

- Code Cleanup, removed SIMAP_DEFAULT_TOPOLOGY
- Added SimapConnectorClient skeleton
- Removed wrong tests
parent 6ade08f3

manifests/simap_connectorservice.yaml

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ spec: 
              value: "admin"

            - name: SIMAP_SERVER_PASSWORD

              value: "admin"

            - name: SIMAP_DEFAULT_TOPOLOGY

              value: "te"

          startupProbe:

            grpc:

              port: 9090

src/simap_connector/Config.py

+5 −7
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
# limitations under the License.





from common.Constants import DEFAULT_TOPOLOGY_NAME

from common.Settings import get_setting



SIMAP_SERVER_SCHEME   = str(get_setting('SIMAP_SERVER_SCHEME',    default='http'     ))
@@ -21,4 +20,3 @@ SIMAP_SERVER_ADDRESS = str(get_setting('SIMAP_SERVER_ADDRESS', default='127. 
SIMAP_SERVER_PORT     = int(get_setting('SIMAP_SERVER_PORT',      default='80'       ))

SIMAP_SERVER_USERNAME = str(get_setting('SIMAP_SERVER_USERNAME',  default='admin'    ))

SIMAP_SERVER_PASSWORD = str(get_setting('SIMAP_SERVER_PASSWORD',  default='admin'    ))
 
SIMAP_DEFAULT_TOPOLOGY = str(get_setting('SIMAP_DEFAULT_TOPOLOGY', default=DEFAULT_TOPOLOGY_NAME))

src/simap_connector/client/SimapConnectorClient.py

0 → 100644
+50 −0
Original line number 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.



import grpc, logging

from common.Constants import ServiceNameEnum

from common.proto.context_pb2 import Empty

#from common.proto.e2eorchestrator_pb2_grpc import E2EOrchestratorServiceStub

from common.Settings import get_service_host, get_service_port_grpc

from common.tools.client.RetryDecorator import delay_exponential, retry

#from common.tools.grpc.Tools import grpc_message_to_json

#from common.proto.e2eorchestrator_pb2 import E2EOrchestratorRequest, E2EOrchestratorReply



LOGGER = logging.getLogger(__name__)

MAX_RETRIES = 15

DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0)

RETRY_DECORATOR = retry(

    max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,

    prepare_method_name='connect',

)



class SimapConnectorClient:

    def __init__(self, host=None, port=None):

        if not host: host = get_service_host(ServiceNameEnum.SIMAP_CONNECTOR)

        if not port: port = get_service_port_grpc(ServiceNameEnum.SIMAP_CONNECTOR)

        self.endpoint = '{:s}:{:s}'.format(str(host), str(port))

        LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))

        self.channel = None

        self.stub = None

        self.connect()

        LOGGER.debug('Channel created')



    def connect(self):

        self.channel = grpc.insecure_channel(self.endpoint)

        #self.stub = E2EOrchestratorServiceStub(self.channel)



    def close(self):

        if self.channel is not None: self.channel.close()

        self.channel = None

        self.stub = None

src/simap_connector/client/__init__.py

0 → 100644
+13 −0
Original line number 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.

src/simap_connector/tests/__init__.py

0 → 100644
+14 −0
Original line number 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.