Commit 10339b3a authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI component - IETF L2VPN: 

- Fixed de-duplication of L2 service names/uuids
- Fixed log messaging
parent 6d4c4288

src/nbi/service/ietf_l2vpn/L2VPN_SiteNetworkAccesses.py

+6 −16
Original line number Diff line number Diff line
@@ -118,14 +118,8 @@ class L2VPN_SiteNetworkAccesses(Resource): 
            for service in get_services(context_client):

                if service.service_type != ServiceTypeEnum.SERVICETYPE_L2NM: continue



                MSG = '[_prepare_request_payload] LOOP service={:s}'

                LOGGER.warning(MSG.format(grpc_message_to_json_string(service)))



                vpn_ids = [service.service_id.service_uuid.uuid, service.name]



                MSG = '[_prepare_request_payload] LOOP vpn_ids={:s}'

                LOGGER.warning(MSG.format(str(vpn_ids)))



                # De-duplicate services uuid/names in case service_uuid == service_name

                vpn_ids = {service.service_id.service_uuid.uuid, service.name}

                for vpn_id in vpn_ids:

                    vpn_services.append({

                        'vpn-id': vpn_id,
@@ -136,11 +130,8 @@ class L2VPN_SiteNetworkAccesses(Resource): 
                        'ce-vlan-cos-preservation': True,

                    })



                MSG = '[_prepare_request_payload] LOOP vpn_services={:s}'

                LOGGER.warning(MSG.format(str(vpn_services)))



            MSG = '[_prepare_request_payload] FINAL vpn_services={:s}'

            LOGGER.warning(MSG.format(str(vpn_services)))

            MSG = '[_prepare_request_payload] vpn_services={:s}'

            LOGGER.debug(MSG.format(str(vpn_services)))



            request_data = {'ietf-l2vpn-svc:l2vpn-svc': {

                'vpn-services': {
@@ -160,9 +151,8 @@ class L2VPN_SiteNetworkAccesses(Resource): 
                }]}

            }}



            MSG = '[_prepare_request_payload] FINAL request_data={:s}'

            LOGGER.warning(MSG.format(str(request_data)))



            MSG = '[_prepare_request_payload] request_data={:s}'

            LOGGER.debug(MSG.format(str(request_data)))

            return request_data



        errors.append('Unexpected request: {:s}'.format(str(request_data)))