bugs fixed (142f8f38) · Commits · TFS / controller

bands.json

+62 −1

Original line number	Original line	Diff line number	Diff line
	{"1": {"optical_band_id": 1, "bidir": 0, "src": "R1", "dst": "R2", "flows": {"R1": {"f": {"in": "0", "out": "port-1-out"}, "b": {}}, "R2": {"f": {"in": "port-1-in", "out": "0"}, "b": {}}}, "band_type": "c_slots", "fiber_forward": {}, "fiber_backward": {}, "op-mode": 0, "n_slots": 16, "links": ["R1-R2"], "path": ["R1", "R2"], "band": 200000, "freq": 192106250, "is_active": false, "src_port": "port-1-out", "dst_port": "port-1-in", "rev_dst_port": "port-1-in", "rev_src_port": "port-1-out", "c_slots": {"1": 1, "2": 1, "3": 1, "4": 1, "5": 1, "6": 1, "7": 1, "8": 1, "9": 1, "10": 1, "11": 1, "12": 1, "13": 1, "14": 1, "15": 1, "16": 1}, "served_lightpaths": []}, "2": {"optical_band_id": 2, "bidir": 0, "src": "R1", "dst": "R2", "flows": {"R1": {"f": {"in": "0", "out": "port-1-out"}, "b": {}}, "R2": {"f": {"in": "port-1-in", "out": "0"}, "b": {}}}, "band_type": "c_slots", "fiber_forward": {}, "fiber_backward": {}, "op-mode": 0, "n_slots": 16, "links": ["R1-R2"], "path": ["R1", "R2"], "band": 200000, "freq": 192106250, "is_active": true, "src_port": "port-1-out", "dst_port": "port-1-in", "rev_dst_port": "port-1-in", "rev_src_port": "port-1-out", "c_slots": {"1": 0, "2": 0, "3": 0, "4": 0, "5": 0, "6": 0, "7": 0, "8": 0, "9": 0, "10": 0, "11": 0, "12": 0, "13": 0, "14": 0, "15": 0, "16": 0}, "served_lightpaths": [2, 3]}}		{
			"1": {
			"optical_band_id": 1,
			"bidir": 0,
			"src": "R1",
			"dst": "R2",
			"flows": {
			"R1": {
			"f": {
			"in": "0",
			"out": "101"
			},
			"b": {}
			},
			"R2": {
			"f": {
			"in": "111",
			"out": "0"
			},
			"b": {}
			}
			},
			"band_type": "c_slots",
			"fiber_forward": {},
			"fiber_backward": {},
			"op-mode": 0,
			"n_slots": 16,
			"links": [
			"R1-R2"
			],
			"path": [
			"R1",
			"R2"
			],
			"band": 200000,
			"freq": 192106250,
			"is_active": false,
			"src_port": "101",
			"dst_port": "111",
			"rev_dst_port": "111",
			"rev_src_port": "101",
			"c_slots": {
			"1": 1,
			"2": 1,
			"3": 1,
			"4": 1,
			"5": 1,
			"6": 1,
			"7": 1,
			"8": 1,
			"9": 1,
			"10": 1,
			"11": 1,
			"12": 1,
			"13": 1,
			"14": 1,
			"15": 1,
			"16": 1
			},
			"served_lightpaths": []
			}
			}
			No newline at end of file

lightpath.json

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			{"1": {"flow_id": 1, "src": "T1.1", "dst": "T2.1", "bitrate": 100, "bidir": 0, "flows": {"T1.1": {"f": {"in": "0", "out": "1"}, "b": {}}, "R1": {"f": {"in": "12", "out": "101"}, "b": {}}, "R2": {"f": {"in": "111", "out": "2"}, "b": {}}, "T2.1": {"f": {"in": "6", "out": "0"}, "b": {}}}, "band_type": "c_slots", "slots": [1, 2, 3, 4], "fiber_forward": {}, "fiber_backward": {}, "op-mode": 1, "n_slots": 4, "links": ["T1.1-R1", "R2-T2.1"], "path": ["R1", "R2"], "band": 50000, "freq": 192031250, "is_active": false, "parent_opt_band": 1, "new_optical_band": 1}, "2": {"flow_id": 2, "src": "T1.1", "dst": "T2.1", "bitrate": 100, "bidir": 0, "flows": {"T1.1": {"f": {"in": "0", "out": "1"}, "b": {}}, "R1": {"f": {"in": "12", "out": "101"}, "b": {}}, "R2": {"f": {"in": "111", "out": "2"}, "b": {}}, "T2.1": {"f": {"in": "6", "out": "0"}, "b": {}}}, "band_type": "c_slots", "slots": [5, 6, 7, 8], "fiber_forward": {}, "fiber_backward": {}, "op-mode": 1, "n_slots": 4, "links": ["T1.1-R1", "R2-T2.1"], "path": ["T1.1", "R1", "R2", "T2.1"], "band": 50000, "freq": 192081250, "is_active": false, "parent_opt_band": 1, "new_optical_band": 0}}

{"1": {"flow_id": 1, "src": "T1.1", "dst": "T2.1", "bitrate": 100, "bidir": 0, "flows": {"T1.1": {"f": {"in": "0", "out": "1"}, "b": {}}, "R1": {"f": {"in": "12", "out": "101"}, "b": {}}, "R2": {"f": {"in": "111", "out": "2"}, "b": {}}, "T2.1": {"f": {"in": "6", "out": "0"}, "b": {}}}, "band_type": "c_slots", "slots": [1, 2, 3, 4], "fiber_forward": {}, "fiber_backward": {}, "op-mode": 1, "n_slots": 4, "links": ["T1.1-R1", "R2-T2.1"], "path": ["R1", "R2"], "band": 50000, "freq": 192031250, "is_active": false, "parent_opt_band": 1, "new_optical_band": 1}, "2": {"flow_id": 2, "src": "T1.1", "dst": "T2.1", "bitrate": 100, "bidir": 0, "flows": {"T1.1": {"f": {"in": "0", "out": "1"}, "b": {}}, "R1": {"f": {"in": "12", "out": "101"}, "b": {}}, "R2": {"f": {"in": "111", "out": "2"}, "b": {}}, "T2.1": {"f": {"in": "6", "out": "0"}, "b": {}}}, "band_type": "c_slots", "slots": [5, 6, 7, 8], "fiber_forward": {}, "fiber_backward": {}, "op-mode": 1, "n_slots": 4, "links": ["T1.1-R1", "R2-T2.1"], "path": ["T1.1", "R1", "R2", "T2.1"], "band": 50000, "freq": 192081250, "is_active": false, "parent_opt_band": 1, "new_optical_band": 0}}

links.json

+1712 −1

File changed.

Preview size limit exceeded, changes collapsed.

my_deploy.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@
	export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"		export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"

	# Set the list of components, separated by spaces, you want to build images for, and deploy.		# Set the list of components, separated by spaces, you want to build images for, and deploy.
	export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice webui nbi "		export TFS_COMPONENTS="context device pathcomp opticalcontroller qkd_app service slice webui nbi "

	# Uncomment to activate Monitoring (old)		# Uncomment to activate Monitoring (old)
	#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"		#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

src/service/service/tools/OpticalTools.py

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -66,11 +66,11 @@ def get_optical_controller_base_url() -> str:
	return base_url		return base_url

	opticalcontrollers_url = find_environment_variables([		opticalcontrollers_url = find_environment_variables([
	VAR_NAME_OPTICAL_CONTROLLER_HOST,		VAR_NAME_OPTICAL_CTRL_HOST,
	VAR_NAME_OPTICAL_CONTROLLER_PORT,		VAR_NAME_OPTICAL_CTRL_PORT,
	])		])
	OPTICAL_IP = opticalcontrollers_url.get(VAR_NAME_OPTICAL_CONTROLLER_HOST)		OPTICAL_IP = opticalcontrollers_url.get(VAR_NAME_OPTICAL_CTRL_HOST)
	OPTICAL_PORT = opticalcontrollers_url.get(VAR_NAME_OPTICAL_CONTROLLER_PORT)		OPTICAL_PORT = opticalcontrollers_url.get(VAR_NAME_OPTICAL_CTRL_PORT)


	def get_uuids_from_names(devices: List[Device], device_name: str, port_name: str):		def get_uuids_from_names(devices: List[Device], device_name: str, port_name: str):
	@@ -162,7 +162,7 @@ def get_optical_band(idx) -> str:
	def delete_lightpath( src, dst, bitrate, ob_id,delete_band,flow_id=None) -> str:		def delete_lightpath( src, dst, bitrate, ob_id,delete_band,flow_id=None) -> str:
	reply = "200"		reply = "200"
	delete_band=1 if delete_band else 0		delete_band=1 if delete_band else 0
	if not testing:		if not TESTING:
	urlx=None		urlx=None
	if flow_id is not None:		if flow_id is not None:
	urlx = "http://{}:{}/OpticalTFS/DelFlexLightpath/{}/{}/{}/{}/{}/{}".format(OPTICAL_IP, OPTICAL_PORT, src, dst, bitrate, ob_id,delete_band,flow_id)		urlx = "http://{}:{}/OpticalTFS/DelFlexLightpath/{}/{}/{}/{}/{}/{}".format(OPTICAL_IP, OPTICAL_PORT, src, dst, bitrate, ob_id,delete_band,flow_id)
	@@ -178,7 +178,7 @@ def delete_lightpath( src, dst, bitrate, ob_id,delete_band,flow_id=None) -> str:

	def DelFlexLightpath (flow_id,src,dst,bitrate,o_band_id):		def DelFlexLightpath (flow_id,src,dst,bitrate,o_band_id):
	reply = "200"		reply = "200"
	if not testing:		if not TESTING:
	urlx = "http://{}:{}/OpticalTFS/DelFlexLightpath/{}/{}/{}/{}/{}".format(OPTICAL_IP, OPTICAL_PORT, flow_id, src, dst, bitrate,o_band_id)		urlx = "http://{}:{}/OpticalTFS/DelFlexLightpath/{}/{}/{}/{}/{}".format(OPTICAL_IP, OPTICAL_PORT, flow_id, src, dst, bitrate,o_band_id)

	headers = {"Content-Type": "application/json"}		headers = {"Content-Type": "application/json"}