projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding cover to tox.ini default envs
[osm/RO.git]
/
RO
/
osm_ro
/
wim
/
wan_link_actions.py
diff --git
a/RO/osm_ro/wim/wan_link_actions.py
b/RO/osm_ro/wim/wan_link_actions.py
index
7409fb7
..
febbc31
100644
(file)
--- 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
)
NoRecordFound,
NoExternalPortFound
)
-from .sdnconn import SdnConnectorError
+from
osm_ro_plugin
.sdnconn import SdnConnectorError
INSTANCE_NET_STATUS_ERROR = ('DOWN', 'ERROR', 'VIM_ERROR',
'DELETED', 'SCHEDULED_DELETION')
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'] = {
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'
}
else:
point['service_endpoint_encapsulation_type'] = 'none'
@@
-327,8
+329,8
@@
class WanLinkCreate(RefreshMixin, CreateAction):
if len(connection_points) == 2:
return 'ELINE'
else:
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"""
def _update_persistent_data(self, persistence, service_uuid, conn_info):
"""Store plugin/connector specific information in the database"""