after rebase

asadarafat · Oct 31, 2024 · aaa2bf1 · aaa2bf1
1 parent 78b3a3f
commit aaa2bf1
Show file tree

Hide file tree

Showing 126 changed files with 114 additions and 35,884 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,28 @@
+logs/*
+rawTopoFile/clab/*
+rawTopoFile/clab/**
+rawTopoFile/license.txt
+rawTopoFile/topo-vf-hco-ip-certification.yml
+rawTopoFile/clab-topoViewerDemo/**
+rawTopoFile/topo-clab-demo.yaml
+rawTopoFile/topo-clab-demo.bak
+rawTopoFile/clab-demo/*
+
+
+config/*
+webpack.config.js
+.babelrc
+go_tools/ygot
+go_tools/ygot/**
+html-static/template/clab/button.tmpl
+node_modules/**
+_archive/**
+html-public/**
+html-react/**
+README-copy.md
+README-copy2.md
+package-lock.json
+package.json
+.cache/**
+clab-3tierSmall/**
+README-02.md
diff --git a/...age/topoViewer-WiresharkHelperApp-MAC.gif → ...ive/topoViewer-WiresharkHelperApp-MAC.gif b/...age/topoViewer-WiresharkHelperApp-MAC.gif → ...ive/topoViewer-WiresharkHelperApp-MAC.gif
diff --git a/docs/image/topoViewer-linkProperties.gif → docs/_archive/topoViewer-linkProperties.gif b/docs/image/topoViewer-linkProperties.gif → docs/_archive/topoViewer-linkProperties.gif
diff --git a/docs/image/topoViewer-nodeProperties.gif → docs/_archive/topoViewer-nodeProperties.gif b/docs/image/topoViewer-nodeProperties.gif → docs/_archive/topoViewer-nodeProperties.gif
diff --git a/.../image/topoViewer-nodeTerminalConsole.gif → ...rchive/topoViewer-nodeTerminalConsole.gif b/.../image/topoViewer-nodeTerminalConsole.gif → ...rchive/topoViewer-nodeTerminalConsole.gif
diff --git a/docs/image/topoViewer-nodeWebConsole.gif → docs/_archive/topoViewer-nodeWebConsole.gif b/docs/image/topoViewer-nodeWebConsole.gif → docs/_archive/topoViewer-nodeWebConsole.gif
diff --git a/docs/image/topoViewer-quickstart.png → docs/_archive/topoViewer-quickstart.png b/docs/image/topoViewer-quickstart.png → docs/_archive/topoViewer-quickstart.png
diff --git a/docs/quickstart/clab-demo.yaml b/docs/quickstart/clab-demo.yaml
@@ -4,19 +4,19 @@ topology:
   nodes:
     topoviewer:
       kind: linux
-      image: ghcr.io/asadarafat/topoviewer:nightly-24.10.27a
+      image: ghcr.io/asadarafat/topoviewer:${TOPOVIEWER_VERSION:=nightly-24.10.30}
       ports:
-        - 8088:8088
+        - ${SERVER_PORT:=8088}:${SERVER_PORT:=8088}
       startup-delay: 5
       binds:
         - /var/run/docker.sock:/var/run/docker.sock:ro
         - clab-demo.yaml:/opt/topoviewer/local-bind/clab-demo.yaml:ro
       env:
         ### These are the environment variables for topoviewer container
-        ALLOWED_HOSTNAME: "100.124.41.89"
-        CLAB_USER: "asad"
-        CLAB_PASS: "PassW0rd"
-        SERVER_PORT: "8088"
+        ALLOWED_HOSTNAME: ${CLAB_USER:=100.124.41.89}
+        CLAB_USER: ${CLAB_USER:=topoviewer}
+        CLAB_PASS: ${CLAB_PASS:=pass}
+        SERVER_PORT: ${SERVER_PORT:=8088}
         CLAB_TOPO_YAML: "clab-demo.yaml"
       labels:
         topoviewer-role: controller

diff --git a/go_cloudshellwrapper/constants.go b/go_cloudshellwrapper/constants.go
@@ -1,258 +1,8 @@
 package cloudshellwrapper
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-var VersionInfo string = "nightly-24.01.21p"
-=======
-var VersionInfo string = "nightly-24.01.21o"
->>>>>>> e215c86 (asd)
-=======
-var VersionInfo string = "nightly-24.01.22a"
->>>>>>> b715a05 (commit with tag nightly-24.01.22a)
-=======
-var VersionInfo string = "nightly-23.01.24a"
->>>>>>> cd0edea (commit with tag nightly-23.01.24a)
-=======
-var VersionInfo string = "nightly-23.01.24b"
->>>>>>> e0dffde (commit with tag nightly-23.01.24b)
-=======
-var VersionInfo string = "nightly-24.01.22b"
->>>>>>> 6f5aff7 (commit with tag nightly-24.01.22b)
-=======
-var VersionInfo string = "nightly-24.01.24a"
->>>>>>> 408e672 (commit with tag nightly-24.01.24a)
-=======
-var VersionInfo string = "nightly-24.01.24b"
->>>>>>> 0fed451 (commit with tag nightly-24.01.24b)
-=======
-var VersionInfo string = "nightly-24.01.24c"
->>>>>>> 51fea5c (commit with tag nightly-24.01.24c)
-=======
-var VersionInfo string = "nightly-24.01.24d"
->>>>>>> df3164a (commit with tag nightly-24.01.24d)
-=======
-var VersionInfo string = "nightly-24.01.26"
->>>>>>> 76f8dfd (commit with tag nightly-24.01.26)
-=======
-var VersionInfo string = "nightly-24.01.21p"
-=======
-var VersionInfo string = "nightly-24.01.21p"
->>>>>>> 086a68742ab98e626a7a3b18058f719644aaaddd
->>>>>>> 8d58c71 (commit with tag nightly-24.01.21p)
-=======
-var VersionInfo string = "nightly-24.01.26"
->>>>>>> a7c8bf4 (dev)
-=======
-var VersionInfo string = "nightly-24.01.30"
->>>>>>> 7669636 (commit with tag nightly-24.01.30)
-=======
-var VersionInfo string = "nightly-24.01.30a"
->>>>>>> 1cc9412 (commit with tag nightly-24.01.30a)
-=======
-var VersionInfo string = "nightly-24.01.30b"
->>>>>>> dca31bf (commit with tag nightly-24.01.30b)
-=======
-var VersionInfo string = "nightly-24.02.03"
->>>>>>> 737a4e5 (commit with tag nightly-24.02.03)
-=======
-var VersionInfo string = "nightly-24.02.03a"
->>>>>>> 685ffdf (commit with tag nightly-24.02.03a)
-=======
-var VersionInfo string = "nightly24.02.03b"
->>>>>>> 2eeaa61 (commit with tag nightly24.02.03b)
-=======
-var VersionInfo string = "nightly24.02.03c"
->>>>>>> 41c7209 (commit with tag nightly24.02.03c)
-=======
-var VersionInfo string = "nightly-24.02.04"
->>>>>>> 73c79c9 (commit with tag nightly-24.02.04)
-=======
-var VersionInfo string = "nightly-24.02.04a"
->>>>>>> f9205e2 (commit with tag nightly-24.02.04a)
-=======
-var VersionInfo string = "nightly-24.02.04b"
->>>>>>> ba65ff1 (commit with tag nightly-24.02.04b)
-=======
-var VersionInfo string = "ightly-24.02.04bc"
->>>>>>> e3ecbb5 (commit with tag ightly-24.02.04bc)
-=======
-var VersionInfo string = "nightly-24.02.04bc"
->>>>>>> 9bb8106 (commit with tag nightly-24.02.04bc)
-=======
-var VersionInfo string = "a"
->>>>>>> 89a0ab2 (commit with tag a)
-=======
-var VersionInfo string = "nightly-24.02.05"
->>>>>>> f7bddf8 (commit with tag nightly-24.02.05)
-=======
-var VersionInfo string = "nightly-24.01.30"
->>>>>>> 1b556b4 (commit with tag nightly-24.01.30)
-=======
-var VersionInfo string = "nightly-24.01.30a"
->>>>>>> e0675f4 (commit with tag nightly-24.01.30a)
-=======
-var VersionInfo string = "nightly-24.01.30b"
->>>>>>> f83b6f1 (commit with tag nightly-24.01.30b)
-=======
-var VersionInfo string = "nightly-24.02.05a"
->>>>>>> fd147e4 (commit with tag nightly-24.02.05a)
-=======
-var VersionInfo string = "nightly-24.02.05b"
->>>>>>> 1bff5f1 (commit with tag nightly-24.02.05b)
-=======
-var VersionInfo string = "nightly-24.02.06"
->>>>>>> 0d34745 (commit with tag nightly-24.02.06)
-=======
-var VersionInfo string = "nightly-24.02.11"
-<<<<<<< HEAD
->>>>>>> 3b88c076 (commit with tag nightly-24.02.11)
-=======
-=======
-var VersionInfo string = "nightly-24.07.07"
->>>>>>> 7b0447c7 (commit with tag nightly-24.07.07)
-=======
-var VersionInfo string = "nightly-24.07.12"
->>>>>>> fc0a61e1 (commit with tag nightly-24.07.12)
-=======
-var VersionInfo string = "nightly-24.07.07a"
->>>>>>> aa29c0d3 (commit with tag nightly-24.07.07a)
-=======
-var VersionInfo string = "nightly-24.07.13"
->>>>>>> 6748ca70 (commit with tag nightly-24.07.13)
-=======
-var VersionInfo string = "nightly-24.07.14"
->>>>>>> 0a944641 (commit with tag nightly-24.07.14)
-=======
-var VersionInfo string = "nightly-24.07.18"
->>>>>>> 80ce730c (commit with tag nightly-24.07.18)
-=======
-var VersionInfo string = "nightly-24.07.19"
->>>>>>> 4e1bdb44 (commit with tag nightly-24.07.19)
-=======
-var VersionInfo string = "nightly-24.08.04"
->>>>>>> 25621892 (commit with tag nightly-24.08.04)
-=======
-var VersionInfo string = "nightly-24.08.06"
->>>>>>> b5957742 (commit with tag nightly-24.08.06)
-=======
-var VersionInfo string = "nightly-24.08.13"
->>>>>>> b4c0146d (commit with tag nightly-24.08.13)
-=======
-var VersionInfo string = "nightly-24.09.04"
->>>>>>> 787e6c4d (commit with tag nightly-24.09.04)
-=======
-var VersionInfo string = "nightly-24.10.20"
->>>>>>> cf9c442a (commit with tag nightly-24.10.20)
-=======
-var VersionInfo string = "nightly-24.10.20a"
->>>>>>> 6d3ffa96 (commit with tag nightly-24.10.20a)
-=======
-var VersionInfo string = "nightly-24.10.20c"
->>>>>>> 1e18b5b3 (commit with tag nightly-24.10.20c)
-=======
-var VersionInfo string = "nightly-24.10.20d"
->>>>>>> 36a8c2e0 (commit with tag nightly-24.10.20d)
-=======
-var VersionInfo string = "nightly-24.10.20e"
->>>>>>> d8b63c56 (commit with tag nightly-24.10.20e)
-=======
-var VersionInfo string = "nightly-24.10.20f"
->>>>>>> 3cda0a7f (commit with tag nightly-24.10.20f)
-=======
-var VersionInfo string = "nightly-24.10.20g"
->>>>>>> cdc1daba (commit with tag nightly-24.10.20g)
-=======
-var VersionInfo string = "nightly-24.10.21"
->>>>>>> dd190ba2 (commit with tag nightly-24.10.21)
-=======
-var VersionInfo string = "nightly-24.10.21a"
->>>>>>> 4a7bae9b (commit with tag nightly-24.10.21a)
-=======
-var VersionInfo string = "nightly-24.10.21b"
->>>>>>> 058346da (commit with tag nightly-24.10.21b)
-=======
-var VersionInfo string = "nightly-24.10.22"
->>>>>>> e2e74ebe (commit with tag nightly-24.10.22)
-=======
-var VersionInfo string = "nightly-24.10.26a"
->>>>>>> f8ee2888 (commit with tag nightly-24.10.26a)
-=======
-var VersionInfo string = "nightly-24.10.26b"
->>>>>>> 6648d2fc (commit with tag nightly-24.10.26b)
-=======
-var VersionInfo string = "nightly-24.10.26c"
->>>>>>> 8051b90f (commit with tag nightly-24.10.26c)
-=======
-var VersionInfo string = "nightly-24.10.27"
->>>>>>> dd77a5cf (commit with tag nightly-24.10.27)
-=======
-var VersionInfo string = "nightly-24.10.27a"
->>>>>>> df66c7fb (commit with tag nightly-24.10.27a)
-=======
 var VersionInfo string = "nightly-24.10.30"
->>>>>>> a8988f05 (commit with tag nightly-24.10.30)
 
 // create html-public files
 var HtmlPublicPrefixPath string = "./html-public/"
 var HtmlStaticPrefixPath string = "./html-static/"
 var HtmlTemplatePath string = "./html-static/template/clab/"
->>>>>>> ba02c7b7 (adding python actions - works UI and backend)