X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO-SDN-juniper_contrail%2Fosm_rosdn_juniper_contrail%2Fsdn_api.py;h=6c2f72b0eab4d8d69828e4f63b3549ad8c3ae783;hp=c8cca2286afdd57e00aceb5e0560dda86ddda5eb;hb=e493e9b91720e5116e00b4c06cf66c767bccce2f;hpb=7277486065c905f91477bb064da86855a8fa269a 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 c8cca228..6c2f72b0 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 @@ -29,7 +29,7 @@ class UnderlayApi: def __init__(self, url, config=None, user=None, password=None, logger=None): - self.logger = logger or logging.getLogger("openmano.sdnconn.junipercontrail.sdnapi") + self.logger = logger or logging.getLogger("ro.sdn.junipercontrail.sdnapi") self.controller_url = url if not url: @@ -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 }