projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing bug 1437
[osm/RO.git]
/
RO-SDN-juniper_contrail
/
osm_rosdn_juniper_contrail
/
sdn_api.py
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
c8cca22
..
6c2f72b
100644
(file)
--- 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):
def __init__(self, url, config=None, user=None, password=None, logger=None):
- self.logger = logger or logging.getLogger("
openmano.sdncon
n.junipercontrail.sdnapi")
+ self.logger = logger or logging.getLogger("
ro.sd
n.junipercontrail.sdnapi")
self.controller_url = url
if not url:
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):
# 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):
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
# Virtual network operations
@@
-248,8
+248,8
@@
class UnderlayApi:
profile_dict = {
"local_link_information": [
{
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
}
"switch_info": switch_id,
"fabric": self.fabric
}