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

Pre-merge code cleanup

parent 7ea63f6d

src/service/service/ServiceServiceServicerImpl.py

+6 −6
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 


        service = Service()

        service.CopyFrom(request if _service is None else _service)

        LOGGER.info(f"Ipdate_service {service}")



        if service.service_type == ServiceTypeEnum.SERVICETYPE_UNKNOWN:                     # pylint: disable=no-member

            service.service_type = request.service_type                                     # pylint: disable=no-member

        service.service_status.service_status = ServiceStatusEnum.SERVICESTATUS_PLANNED     # pylint: disable=no-member
@@ -200,7 +200,7 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 
        del service.service_endpoint_ids[:] # pylint: disable=no-member

        for endpoint_id in request.service_endpoint_ids:

            service.service_endpoint_ids.add().CopyFrom(endpoint_id)    # pylint: disable=no-member

        LOGGER.info(f"service_endpoints {service}")



        device_list = context_client.ListDevices(Empty())



        LOGGER.debug('[before] request={:s}'.format(grpc_message_to_json_string(request)))
@@ -231,7 +231,7 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 
            if closer_endpoint_id not in service_endpoint_ids:

                service.service_endpoint_ids.append(closer_endpoint_id)

        

        LOGGER.info('[after] request={:s}'.format(grpc_message_to_json_string(request)))

        LOGGER.debug('[after] request={:s}'.format(grpc_message_to_json_string(request)))

        LOGGER.debug('[after] service={:s}'.format(grpc_message_to_json_string(service)))



        del service.service_constraints[:]  # pylint: disable=no-member
@@ -275,7 +275,6 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 


            devs = []

            ports = []

            LOGGER.info(f"endpoint_id service {service}")

            for endpoint_id in service.service_endpoint_ids:

                endpoint_device_uuid = endpoint_id.device_id.device_uuid.uuid

                if "." in endpoint_device_uuid:
@@ -284,6 +283,7 @@ class ServiceServiceServicerImpl(ServiceServiceServicer): 
                    endpoint_device_name = device_names[endpoint_device_uuid]

                devs.append(endpoint_device_name)

                ports.append(endpoint_id.endpoint_uuid.uuid)



            src = devs[0]

            dst = devs[1]

            bidir = None

src/service/service/service_handlers/__init__.py

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ from .tapi_tapi.TapiServiceHandler import TapiServiceHandler 
from .tapi_xr.TapiXrServiceHandler import TapiXrServiceHandler

from .optical_tfs.OpticalTfsServiceHandler import OpticalTfsServiceHandler

from .oc.OCServiceHandler import OCServiceHandler



from .ip_link.IP_LinkServiceHandler import IP_LinkServiceHandler

from .qkd.qkd_service_handler import QKDServiceHandler

from .l3nm_ryu.L3NMRyuServiceHandler import L3NMRyuServiceHandler
@@ -166,7 +165,10 @@ SERVICE_HANDLERS = [ 
    (OCServiceHandler, [

        {

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY,

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_OC,DeviceDriverEnum.DEVICEDRIVER_OPENROADM],

            FilterFieldEnum.DEVICE_DRIVER : [

                DeviceDriverEnum.DEVICEDRIVER_OC,

                DeviceDriverEnum.DEVICEDRIVER_OPENROADM

            ],

        }

    ]),

    (IP_LinkServiceHandler, [

src/service/service/service_handlers/l3nm_ryu/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ 
# 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/service/service/task_scheduler/tasks/Task_OpticalConnectionConfigure.py

+6 −7
Original line number Diff line number Diff line
@@ -95,4 +95,3 @@ class Task_OpticalConnectionConfigure(_Task): 
            str_connection = grpc_message_to_json_string(connection)

            str_service = grpc_message_to_json_string(service)

            raise OperationFailedException(MSG.format(str_connection, str_service), extra_details=errors)

src/webui/service/templates/tapi/add_service.html

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 




{% extends 'tapi/base_tapi.html' %}



{%block subcontent%}

    <h1>Add Service : </h1>

     <form id="select_context" method="POST" enctype="multipart/form-data" id="upload_service_form">

        {{ service_form.hidden_tag() }}

        <fieldset class="form-group">

           

           <div class="row mb-3">

                <div class="col-sm-12">

                   <legend>Upload Service </legend>

                    <div class="row mb-3">

                        {{ service_form.descriptors.label(class="col-sm-1 col-form-label") }}

                        <div class="col-sm-5">

                            {% if service_form.descriptors.errors %}

                                {{ service_form.descriptors(class="form-select is-invalid") }}

                                <div class="invalid-feedback">

                                    {% for error in service_form.descriptors.errors %}

                                        <span>{{ error }}</span>

                                    {% endfor %}

                                </div>

                            {% else %}

                                {{ service_form.descriptors(class="form-select") }}

                            {% endif %}

                        </div>

                    </div>

                </div>

             

                <div class="col-sm-2">

                    {{ service_form.submit(class='btn btn-primary',id='upload_service') }}

                    <div id="spinner" class="spinner-border text-primary" style="display:none;" role="status">

                      <span class="sr-only">Loading...</span>

                    </div>

                </div>

            </div>

        </fieldset>

    </form>

    <script>

        document.getElementById('upload_service_form').addEventListener('submit', function() {

          document.getElementById('upload_service').disabled = true;  // prevent double submit

          document.getElementById('spinner').style.display = 'block';

        });

    </script>

{%endblock%}
 
 No newline at end of file