X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-SDN-juniper_contrail%2Fosm_rosdn_juniper_contrail%2Fsdn_api.py;h=151bf6ca13259db87387458d22ad18a3f961655d;hb=refs%2Fchanges%2F51%2F10251%2F4;hp=c99452bb99c019d8477364d764efd7332975370c;hpb=71f7abb8d48b167749e7b03586def13bff0c8a41;p=osm%2FRO.git diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py index c99452bb..151bf6ca 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py @@ -17,7 +17,7 @@ import logging import json -from osm_ro.wim.sdnconn import SdnConnectorError +from osm_ro_plugin.sdnconn import SdnConnectorError from osm_rosdn_juniper_contrail.rest_lib import ContrailHttp from osm_rosdn_juniper_contrail.rest_lib import NotFound # from osm_rosdn_juniper_contrail.rest_lib import DuplicateFound @@ -148,10 +148,10 @@ class UnderlayApi: # Aux methods to avoid code duplication of name conventions def get_vpg_name(self, switch_id, switch_port): - return "{}_{}".format(switch_id, switch_port) + return "{}_{}".format(switch_id, switch_port).replace(":", "_") def get_vmi_name(self, switch_id, switch_port, vlan): - return "{}_{}-{}".format(switch_id, switch_port, vlan) + return "{}_{}-{}".format(switch_id, switch_port, vlan).replace(":", "_") # Virtual network operations @@ -248,8 +248,8 @@ class UnderlayApi: profile_dict = { "local_link_information": [ { - "port_id": switch_port, - "switch_id": switch_port, + "port_id": switch_port.replace(":", "_"), + "switch_id": switch_port.replace(":", "_"), "switch_info": switch_id, "fabric": self.fabric }