commit with tag nightly-25.01.10

asadarafat · Jan 7, 2025 · a4adbbc · a4adbbc
1 parent 63074ea
commit a4adbbc
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 69 deletions.
diff --git a/dist/clab-client-mac/ClabCapture.app.zip b/dist/clab-client-mac/ClabCapture.app.zip
diff --git a/dist/clab-client-windows/ClabCapture.app.zip b/dist/clab-client-windows/ClabCapture.app.zip
diff --git a/dist/clab-topoviewer.tmpl b/dist/clab-topoviewer.tmpl
diff --git a/dist/html-static/clab-client/clab-client-mac/ClabCapture.app.zip b/dist/html-static/clab-client/clab-client-mac/ClabCapture.app.zip
diff --git a/dist/html-static/clab-client/clab-client-windows/ClabCapture.app.zip b/dist/html-static/clab-client/clab-client-windows/ClabCapture.app.zip
diff --git a/dist/html-static/js/dev.js b/dist/html-static/js/dev.js
@@ -2117,8 +2117,12 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		clabAllowedHostname = environments["clab-allowed-hostname"]
 
-		clabServerAddress = environments["clab-server-address"]
+		clabAllowedHostname01 = environments["clab-allowed-hostname01"]
+		if (clabAllowedHostname01 == ""){
+			clabAllowedHostname01 =clabAllowedHostname
+		}
 
+		clabServerAddress = environments["clab-server-address"]
 
 		clabSourceLongName = edgeData["data"]["extraData"]["clabSourceLongName"]
 		clabSourcePort = edgeData["data"]["extraData"]["clabSourcePort"]
@@ -2139,7 +2143,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		} else if (option == "edgeSharkInterface") {
 			if (endpoint == "source") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabSourceLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2151,7 +2155,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 				window.open(edgeSharkHref);
 
 			} else if (endpoint == "target") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabTargetLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2165,7 +2169,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		} else if (option == "edgeSharkSubInterface") {
 			if (referenceElementAfterId == "endpoint-a-edgeshark") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabSourceLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2178,7 +2182,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 			}
 			if (referenceElementAfterId == "endpoint-b-edgeshark") {
 				console.info("linkWireshark - endpoint-b-edgeshark")
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabTargetLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))

diff --git a/dist/topoviewer b/dist/topoviewer
diff --git a/go_cloudshellwrapper/clabHandlers/clabGetEnvironment.go b/go_cloudshellwrapper/clabHandlers/clabGetEnvironment.go
@@ -19,6 +19,7 @@ type Environments struct {
 	EnvClabName             string `json:"clab-name"`
 	EnvClabServerAddress    string `json:"clab-server-address"`
 	EnvAllowedHostname      string `json:"clab-allowed-hostname"`
+	EnvAllowedHostname01    string `json:"clab-allowed-hostname01"`
 	EnvClabServerPort       string `json:"clab-server-port"`
 	EnvDeploymentType       string `json:"deployment-type"`
 	EnvTopoViewerVersion    string `json:"topoviewer-version"`
@@ -59,6 +60,7 @@ func GetEnvironmentsHandler(w http.ResponseWriter, r *http.Request, cyTopo *topo
 		EnvClabName:             cyTopo.ClabTopoDataV2.Name,
 		EnvClabServerAddress:    confClab.GetString("clab-server-address"),
 		EnvAllowedHostname:      confClab.GetStringSlice("allowed-hostnames")[0],
+		EnvAllowedHostname01:    confClab.GetStringSlice("allowed-hostnames")[1],
 		EnvClabServerPort:       fmt.Sprintf("%d", confClab.GetInt("server-port")),
 		EnvDeploymentType:       confClab.GetString("deployment-type"),
 		EnvTopoViewerVersion:    VersionInfo,

diff --git a/go_cloudshellwrapper/constants.go b/go_cloudshellwrapper/constants.go
@@ -1,6 +1,6 @@
 package cloudshellwrapper
 
-var VersionInfo string = "nightly-25.01.09"
+var VersionInfo string = "nightly-25.01.10"
 
 // create html-public files
 var HtmlPublicPrefixPath string = "./html-public/"

diff --git a/go_cloudshellwrapper/constants.go.bak b/go_cloudshellwrapper/constants.go.bak
@@ -1,6 +1,6 @@
 package cloudshellwrapper
 
-var VersionInfo string = "nightly-25.01.08"
+var VersionInfo string = "nightly-25.01.09"
 
 // create html-public files
 var HtmlPublicPrefixPath string = "./html-public/"

diff --git a/html-static/clab-client/clab-client-mac/ClabCapture.app.zip b/html-static/clab-client/clab-client-mac/ClabCapture.app.zip
diff --git a/html-static/clab-client/clab-client-windows/ClabCapture.app.zip b/html-static/clab-client/clab-client-windows/ClabCapture.app.zip
diff --git a/html-static/js/dev.js b/html-static/js/dev.js
@@ -2117,8 +2117,12 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		clabAllowedHostname = environments["clab-allowed-hostname"]
 
-		clabServerAddress = environments["clab-server-address"]
+		clabAllowedHostname01 = environments["clab-allowed-hostname01"]
+		if (clabAllowedHostname01 == ""){
+			clabAllowedHostname01 =clabAllowedHostname
+		}
 
+		clabServerAddress = environments["clab-server-address"]
 
 		clabSourceLongName = edgeData["data"]["extraData"]["clabSourceLongName"]
 		clabSourcePort = edgeData["data"]["extraData"]["clabSourcePort"]
@@ -2139,7 +2143,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		} else if (option == "edgeSharkInterface") {
 			if (endpoint == "source") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabSourceLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2151,7 +2155,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 				window.open(edgeSharkHref);
 
 			} else if (endpoint == "target") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabTargetLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2165,7 +2169,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 
 		} else if (option == "edgeSharkSubInterface") {
 			if (referenceElementAfterId == "endpoint-a-edgeshark") {
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabSourceLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))
@@ -2178,7 +2182,7 @@ async function linkWireshark(event, option, endpoint, referenceElementAfterId) {
 			}
 			if (referenceElementAfterId == "endpoint-b-edgeshark") {
 				console.info("linkWireshark - endpoint-b-edgeshark")
-				baseUrl = `packetflix:ws://${clabAllowedHostname}:5001/capture?`;
+				baseUrl = `packetflix:ws://${clabAllowedHostname01}:5001/capture?`;
 
 				netNsResponse = await sendRequestToEndpointGetV3("/clab-node-network-namespace", argsList = [clabTargetLongName])
 				console.info("linkWireshark - netNsSource: ", netNsResponse.namespace_id.slice(netNsResponse.namespace_id.indexOf("[") + 1, netNsResponse.namespace_id.indexOf("]")))