From cd80faa13caddc80e552f8391081a3555d9e8bb5 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 9 Apr 2024 13:25:48 +0000
Subject: [PATCH] Service component:
- Corrected format of URLs in OpticalTools.py
---
src/service/service/tools/OpticalTools.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/service/service/tools/OpticalTools.py b/src/service/service/tools/OpticalTools.py
index ad2f8cbec..1837bf688 100644
--- a/src/service/service/tools/OpticalTools.py
+++ b/src/service/service/tools/OpticalTools.py
@@ -109,11 +109,11 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str:
if ob_band is None:
if bidir is None:
bidir = 1
- urlx = "{:s}/AddFlexLightpath/{:s}/{:s}/{:s}/{:s}".format(base_url, src, dst, bitrate, bidir)
+ urlx = "{:s}/AddFlexLightpath/{:s}/{:s}/{:s}/{:s}".format(base_url, src, dst, str(bitrate), str(bidir))
else:
if bidir is None:
bidir = 1
- urlx = "{:s}/AddFlexLightpath/{:s}/{:s}/{:s}/{:s}/{:s}".format(base_url, src, dst, bitrate, bidir, ob_band)
+ urlx = "{:s}/AddFlexLightpath/{:s}/{:s}/{:s}/{:s}/{:s}".format(base_url, src, dst, str(bitrate), str(bidir), str(ob_band))
r = requests.put(urlx, headers=headers)
reply = r.text
return reply
@@ -127,7 +127,7 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str:
def get_optical_band(idx) -> str:
if not TESTING:
base_url = get_optical_controller_base_url()
- urlx = "{:s}/GetOpticalBand/{:s}".format(base_url, idx)
+ urlx = "{:s}/GetOpticalBand/{:s}".format(base_url, str(idx))
headers = {"Content-Type": "application/json"}
r = requests.get(urlx, headers=headers)
reply = r.text
@@ -143,7 +143,7 @@ def delete_lightpath(flow_id, src, dst, bitrate) -> str:
reply = "200"
if not TESTING:
base_url = get_optical_controller_base_url()
- urlx = "{:s}/DelLightpath/{:s}/{:s}/{:s}/{:s}".format(base_url, flow_id, src, dst, bitrate)
+ urlx = "{:s}/DelLightpath/{:s}/{:s}/{:s}/{:s}".format(base_url, str(flow_id), src, dst, str(bitrate))
headers = {"Content-Type": "application/json"}
r = requests.delete(urlx, headers=headers)
--
GitLab