Skip to content
Snippets Groups Projects
Commit cd80faa1 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Service component:

- Corrected format of URLs in OpticalTools.py
parent 570d9918
No related branches found
No related tags found
2 merge requests!235Release TeraFlowSDN 3.0,!223Resolve "Fix OFC'24 end-to-end test for Optical Controller component"
...@@ -109,11 +109,11 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str: ...@@ -109,11 +109,11 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str:
if ob_band is None: if ob_band is None:
if bidir is None: if bidir is None:
bidir = 1 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: else:
if bidir is None: if bidir is None:
bidir = 1 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) r = requests.put(urlx, headers=headers)
reply = r.text reply = r.text
return reply return reply
...@@ -127,7 +127,7 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str: ...@@ -127,7 +127,7 @@ def add_lightpath(src, dst, bitrate, bidir, ob_band) -> str:
def get_optical_band(idx) -> str: def get_optical_band(idx) -> str:
if not TESTING: if not TESTING:
base_url = get_optical_controller_base_url() 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"} headers = {"Content-Type": "application/json"}
r = requests.get(urlx, headers=headers) r = requests.get(urlx, headers=headers)
reply = r.text reply = r.text
...@@ -143,7 +143,7 @@ def delete_lightpath(flow_id, src, dst, bitrate) -> str: ...@@ -143,7 +143,7 @@ def delete_lightpath(flow_id, src, dst, bitrate) -> str:
reply = "200" reply = "200"
if not TESTING: if not TESTING:
base_url = get_optical_controller_base_url() 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"} headers = {"Content-Type": "application/json"}
r = requests.delete(urlx, headers=headers) r = requests.delete(urlx, headers=headers)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment