Merge pull request #19 from KatharaFramework/18-fix-topology-machine-label-when-second-or-third-octet-need-display

lorenzo93 · web-flow · commit 3ae4cb2eca8c · 2023-05-25T11:58:59.000+02:00
18 fix topology machine label when second or third octet need display
diff --git a/src/lab-generator/make_draw_model.js b/src/lab-generator/make_draw_model.js
@@ -71,9 +71,9 @@ function get_eth_ip_difference(network, ip) {
 	if (net_split_i.length != ip_split_i.length) return 0;
 	for (let i in net_split_i) {
 		if (net_split_i[i] != ip_split_i[i]) {
-			if (i == 3) return ip_split_i[i];
-			if (i == 2) return ip_split_i[i] + "." + ip_split_i[i + 1];
-			if (i == 1) return ip_split_i[i] + "." + ip_split_i[i + 1] + "." + ip_split_i[i + 2];
+			if (i == 3) return ip_split_i[3];
+			if (i == 2) return ip_split_i[2] + "." + ip_split_i[3];
+			if (i == 1) return ip_split_i[1] + "." + ip_split_i[2] + "." + ip_split_i[3];
 			if (i == 0) return ip_split;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ function get_eth_ip_difference(network, ip) {`
`71`	`71`	`if (net_split_i.length != ip_split_i.length) return 0;`
`72`	`72`	`for (let i in net_split_i) {`
`73`	`73`	`if (net_split_i[i] != ip_split_i[i]) {`
`74`		`- if (i == 3) return ip_split_i[i];`
`75`		`- if (i == 2) return ip_split_i[i] + "." + ip_split_i[i + 1];`
`76`		`- if (i == 1) return ip_split_i[i] + "." + ip_split_i[i + 1] + "." + ip_split_i[i + 2];`
	`74`	`+ if (i == 3) return ip_split_i[3];`
	`75`	`+ if (i == 2) return ip_split_i[2] + "." + ip_split_i[3];`
	`76`	`+ if (i == 1) return ip_split_i[1] + "." + ip_split_i[2] + "." + ip_split_i[3];`
`77`	`77`	`if (i == 0) return ip_split;`
`78`	`78`	`}`
`79`	`79`	`}`