X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Fwan_link_actions.py;h=7dd416525d6dbd92df331b41038d2b55624d6e51;hp=458f3d523974624cde6a06795d667a080557103e;hb=908649a79e7f3ebaeef23517edd2ad3376226fe0;hpb=ed3e4d4fc2819e425bb8b165e43fcbac259d3f1b diff --git a/RO/osm_ro/wim/wan_link_actions.py b/RO/osm_ro/wim/wan_link_actions.py index 458f3d52..7dd41652 100644 --- a/RO/osm_ro/wim/wan_link_actions.py +++ b/RO/osm_ro/wim/wan_link_actions.py @@ -207,9 +207,8 @@ class WanLinkCreate(RefreshMixin, CreateAction): return merge_dicts(wan_port_mapping, service_mapping_info=mapping) def _get_port_sdn(self, ovim, instance_net): - criteria = {'net_id': instance_net['sdn_net_id']} try: - local_port_mapping = ovim.get_ports(filter=criteria) + local_port_mapping = ovim.get_ports(instance_net['sdn_net_id']) if local_port_mapping: return (local_port_mapping[0]['switch_dpid'], @@ -217,7 +216,7 @@ class WanLinkCreate(RefreshMixin, CreateAction): except: # noqa self.logger.exception('Problems when calling OpenVIM') - self.logger.debug('No ports found using criteria:\n%r\n.', criteria) + self.logger.debug("No ports found for sdn_net_id='{}'", instance_net['sdn_net_id']) return None def _evaluate_rules(self, rules, vim_info): @@ -316,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'