Commit 97cf4553 authored by francisco.moreno.external@atos.net's avatar francisco.moreno.external@atos.net
Browse files

Merge remote-tracking branch 'origin/feat/monitoring' into feat/monitoring 

# Conflicts:
#	proto/te.proto
#	src/common/tools/service/__init__.py
#	src/monitoring/service/MonitoringServiceServicerImpl.py
parents 6bdce89e 6938000a

src/common/tools/service/__init__.py

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# 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/monitoring/proto/monitoring_pb2.py

+943 −67

File changed.

Preview size limit exceeded, changes collapsed.

src/monitoring/proto/monitoring_pb2_grpc.py

+389 −26

File changed.

Preview size limit exceeded, changes collapsed.

src/monitoring/service/MonitoringServiceServicerImpl.py

+31 −24

File changed.

Preview size limit exceeded, changes collapsed.

src/monitoring/tests/test_unitary.py

+14 −14
Original line number Diff line number Diff line
@@ -230,20 +230,20 @@ def test_monitor_kpi(monitoring_client,create_kpi_request): 
    assert isinstance(response, context_pb2.Empty)





# Test case that makes use of client fixture to test server's IncludeKpi method

def test_include_kpi(monitoring_client,include_kpi_request):

    # make call to server

    LOGGER.warning('test_include_kpi requesting')

    response = monitoring_client.IncludeKpi(include_kpi_request)

    LOGGER.debug(str(response))

    assert isinstance(response, context_pb2.Empty)



# Test case that makes use of client fixture to test server's GetStreamKpi method

def test_get_stream_kpi(monitoring_client,include_kpi_request):

    LOGGER.warning('test_getstream_kpi begin')

    response = monitoring_client.GetStreamKpi(kpi)

    LOGGER.debug(str(response))

    #assert isinstance(response, monitoring_pb2.Kpi)

# # Test case that makes use of client fixture to test server's IncludeKpi method

# def test_include_kpi(monitoring_client,include_kpi_request):

#     # make call to server

#     LOGGER.warning('test_include_kpi requesting')

#     response = monitoring_client.IncludeKpi(include_kpi_request)

#     LOGGER.debug(str(response))

#     assert isinstance(response, context_pb2.Empty)

#

# # Test case that makes use of client fixture to test server's GetStreamKpi method

# def test_get_stream_kpi(monitoring_client,include_kpi_request):

#     LOGGER.warning('test_getstream_kpi begin')

#     response = monitoring_client.GetStreamKpi(kpi)

#     LOGGER.debug(str(response))

#     #assert isinstance(response, monitoring_pb2.Kpi)



# Test case that makes use of client fixture to test server's GetInstantKpi method

def test_get_instant_kpi(monitoring_client,kpi_id):

proto/te.proto

+2 −2

File changed.

Contains only whitespace changes.