From: bse Date: Wed, 10 Jun 2020 13:01:28 +0000 (+0530) Subject: Fix for bug 1054 X-Git-Tag: release-v8.0-start~14 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=908649a79e7f3ebaeef23517edd2ad3376226fe0 Fix for bug 1054 Issue 1 and 2 is resolved and issue 3 need to be addressed by community. Change-Id: Ib420fc687ebc4d4e7de235aae3ce1b24b3156cdb Signed-off-by: bse --- diff --git a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py index b531cfc6..eb14f557 100644 --- a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py +++ b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py @@ -113,8 +113,8 @@ class OnosVpls(SdnConnectorBase): def create_connectivity_service(self, service_type, connection_points, **kwargs): self.logger.debug("create_connectivity_service, service_type: {}, connection_points: {}". format(service_type, connection_points)) - if service_type.lower() != 'elan': - raise SdnConnectorError('Only ELAN network type is supported by ONOS VPLS.') + if service_type.lower() == 'etree': + raise SdnConnectorError('Only ELINE/ELAN network type is supported by ONOS VPLS.') # FIXME ¿must check number of connection_points? service_uuid = str(uuid.uuid4()) diff --git a/RO/osm_ro/wim/wan_link_actions.py b/RO/osm_ro/wim/wan_link_actions.py index 7409fb78..7dd41652 100644 --- a/RO/osm_ro/wim/wan_link_actions.py +++ b/RO/osm_ro/wim/wan_link_actions.py @@ -315,7 +315,9 @@ class WanLinkCreate(RefreshMixin, CreateAction): if details.get('encapsulation_type') == 'vlan': point['service_endpoint_encapsulation_type'] = 'dot1q' point['service_endpoint_encapsulation_info'] = { - 'vlan': details['encapsulation_id'] + 'vlan': details['encapsulation_id'], + 'switch_dpid': wan_info['switch_dpid'], + 'switch_port': wan_info['switch_port'] } else: point['service_endpoint_encapsulation_type'] = 'none'