X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Fwan_link_actions.py;h=febbc31303dd0a83f92df55249d56b5f7fffe023;hb=aed948dcfe3e1586c184fd31abacbd3b89eb2a2d;hp=7409fb7861aa51b2a91f47a093ef34b6ba07537e;hpb=f99006654443713256d2528ec624b4eb81ba3b77;p=osm%2FRO.git diff --git a/RO/osm_ro/wim/wan_link_actions.py b/RO/osm_ro/wim/wan_link_actions.py index 7409fb78..febbc313 100644 --- a/RO/osm_ro/wim/wan_link_actions.py +++ b/RO/osm_ro/wim/wan_link_actions.py @@ -45,7 +45,7 @@ from .errors import ( NoRecordFound, NoExternalPortFound ) -from .sdnconn import SdnConnectorError +from osm_ro_plugin.sdnconn import SdnConnectorError INSTANCE_NET_STATUS_ERROR = ('DOWN', 'ERROR', 'VIM_ERROR', 'DELETED', 'SCHEDULED_DELETION') @@ -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' @@ -327,8 +329,8 @@ class WanLinkCreate(RefreshMixin, CreateAction): if len(connection_points) == 2: return 'ELINE' else: - raise NotImplementedError('Multipoint connectivity is not ' - 'supported yet.') + # added to support DPB WIM connector + return 'ELAN' def _update_persistent_data(self, persistence, service_uuid, conn_info): """Store plugin/connector specific information in the database"""