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

Pre-release fixing

parent a28cd049

src/device/requirements.in

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ncclient==0.6.13 
p4runtime==1.3.0

paramiko==2.9.2

python-json-logger==2.0.2

pytz==2021.3

#pytz==2021.3

#redis==4.1.2

requests==2.27.1

requests-mock==1.9.3

src/load_generator/requirements.in

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



APScheduler==3.8.1
 
APScheduler==3.10.1

src/monitoring/requirements.in

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ APScheduler==3.10.1 
influx-line-protocol==0.1.4

python-dateutil==2.8.2

python-json-logger==2.0.2

pytz==2021.3

#pytz==2021.3

#redis==4.1.2

requests==2.27.1

xmltodict==0.12.0

src/monitoring/tests/test_unitary.py

+8 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ from common.proto.kpi_sample_types_pb2 import KpiSampleType 
from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, SubsDescriptor, SubsList, AlarmID, \

    AlarmDescriptor, AlarmList, KpiDescriptorList, SubsResponse, AlarmResponse, RawKpiTable #, Kpi, KpiList

from common.tests.MockServicerImpl_Context import MockServicerImpl_Context

from common.tools.object_factory.ConfigRule import json_config_rule_set

from common.tools.service.GenericGrpcService import GenericGrpcService

from common.tools.timestamp.Converters import timestamp_utcnow_to_float #, timestamp_string_to_float

from context.client.ContextClient import ContextClient
@@ -48,7 +49,7 @@ from monitoring.service.NameMapping import NameMapping 
#from monitoring.service.SubscriptionManager import SubscriptionManager

from monitoring.tests.Messages import create_kpi_request, create_kpi_request_d, include_kpi_request, monitor_kpi_request, \

    create_kpi_request_c, kpi_query, subs_descriptor, alarm_descriptor, alarm_subscription #, create_kpi_request_b

from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID

from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID, ENDPOINT_END1_UUID



os.environ['DEVICE_EMULATED_ONLY'] = 'TRUE'

from device.service.drivers import DRIVERS  # pylint: disable=wrong-import-position,ungrouped-imports
@@ -601,6 +602,12 @@ def test_listen_events( 
    LOGGER.info('Adding Device {:s}'.format(DEVICE_DEV1_UUID))

    device_with_connect_rules = copy.deepcopy(DEVICE_DEV1)

    device_with_connect_rules['device_config']['config_rules'].extend(DEVICE_DEV1_CONNECT_RULES)

    device_with_connect_rules['device_config']['config_rules'].append(

        json_config_rule_set(

            '/interface[{:s}]'.format(ENDPOINT_END1_UUID),

            {'name': ENDPOINT_END1_UUID, 'enabled': True}

        )

    )

    response = device_client.AddDevice(Device(**device_with_connect_rules))

    assert response.device_uuid.uuid == DEVICE_DEV1_UUID