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

WebUI component - Load Generator: 

- Corrected list_scalar_range method names
- Corrected form field types
parent f8d94aec

src/webui/service/load_gen/forms.py

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ class LoadGenForm(FlaskForm): 
    holding_time = FloatField('Holding Time [seconds]', default=10, validators=[NumberRange(min=0.0)])

    inter_arrival_time = FloatField('Inter Arrival Time [seconds]', default=0, validators=[NumberRange(min=0.0)])



    availability   = FloatField('Availability [%]', default=DEFAULT_AVAILABILITY,   validators=[Regexp(RE_SCALAR_RANGE_LIST)])

    capacity_gbps  = FloatField('Capacity [Gbps]',  default=DEFAULT_CAPACITY_GBPS,  validators=[Regexp(RE_SCALAR_RANGE_LIST)])

    e2e_latency_ms = FloatField('E2E Latency [ms]', default=DEFAULT_E2E_LATENCY_MS, validators=[Regexp(RE_SCALAR_RANGE_LIST)])

    availability   = StringField('Availability [%]', default=DEFAULT_AVAILABILITY,   validators=[Regexp(RE_SCALAR_RANGE_LIST)])

    capacity_gbps  = StringField('Capacity [Gbps]',  default=DEFAULT_CAPACITY_GBPS,  validators=[Regexp(RE_SCALAR_RANGE_LIST)])

    e2e_latency_ms = StringField('E2E Latency [ms]', default=DEFAULT_E2E_LATENCY_MS, validators=[Regexp(RE_SCALAR_RANGE_LIST)])



    do_teardown = BooleanField('Do Teardown', default=True)

src/webui/service/load_gen/routes.py

+8 −7
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ from flask import redirect, render_template, Blueprint, flash, url_for 
from common.proto.context_pb2 import Empty

from common.proto.load_generator_pb2 import Parameters, RequestTypeEnum

from load_generator.client.LoadGeneratorClient import LoadGeneratorClient

from load_generator.tools.ListScalarRange import list_scalar_range__to__grpc, parse_list_scalar_range

from load_generator.tools.ListScalarRange import (

    list_scalar_range__grpc_to_str, list_scalar_range__list_to_grpc, parse_list_scalar_range)

from .forms import LoadGenForm



load_gen = Blueprint('load_gen', __name__, url_prefix='/load_gen')
@@ -56,9 +57,9 @@ def home(): 
    _holding_time       = round(status.parameters.holding_time       , ndigits=4)

    _inter_arrival_time = round(status.parameters.inter_arrival_time , ndigits=4)



    _availability       = str(status.parameters.availability  ).replace(' ', '')

    _capacity_gbps      = str(status.parameters.capacity_gbps ).replace(' ', '')

    _e2e_latency_ms     = str(status.parameters.e2e_latency_ms).replace(' ', '')

    _availability       = list_scalar_range__grpc_to_str(status.parameters.availability  )

    _capacity_gbps      = list_scalar_range__grpc_to_str(status.parameters.capacity_gbps )

    _e2e_latency_ms     = list_scalar_range__grpc_to_str(status.parameters.e2e_latency_ms)



    form = LoadGenForm()

    set_properties(form.num_requests             , status.parameters.num_requests , readonly=status.running)
@@ -104,9 +105,9 @@ def start(): 
            load_gen_params.record_to_dlt      = form.record_to_dlt.data

            load_gen_params.dlt_domain_id      = form.dlt_domain_id.data



            list_scalar_range__to__grpc(_availability,   load_gen_params.availability  ) # pylint: disable=no-member

            list_scalar_range__to__grpc(_capacity_gbps,  load_gen_params.capacity_gbps ) # pylint: disable=no-member

            list_scalar_range__to__grpc(_e2e_latency_ms, load_gen_params.e2e_latency_ms) # pylint: disable=no-member

            list_scalar_range__list_to_grpc(_availability,   load_gen_params.availability  ) # pylint: disable=no-member

            list_scalar_range__list_to_grpc(_capacity_gbps,  load_gen_params.capacity_gbps ) # pylint: disable=no-member

            list_scalar_range__list_to_grpc(_e2e_latency_ms, load_gen_params.e2e_latency_ms) # pylint: disable=no-member



            del load_gen_params.request_types[:] # pylint: disable=no-member

            request_types = list()