Closes #62, #60, #59, #57, #56, #55, #49

Author: camrossi

app/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 WORKDIR /app
 ENV PATH "$PATH:/app"
 COPY requirements.txt requirements.txt

app/Dockerfile-init

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 RUN pip3 install requests
 WORKDIR /app
 COPY init.py .

app/buildah_build.sh

@@ -3,13 +3,15 @@
 export MANIFEST_NAME="vkaci"
 export MANIFEST_NAME_INIT="vkaci-init"
 # Set the required variables
-export REGISTRY="quay.io"
-export USER="datacenter"
+export REGISTRY=harbor.cam.ciscolabs.com 
+export USER=library
+#export REGISTRY="quay.io"
+#export USER="datacenter"
 export IMAGE_NAME="vkaci"
 export IMAGE_NAME_INIT="vkaci-init"
 if [ -z "$1" ]
     then
-        export IMAGE_TAG="v1.1.0"
+        export IMAGE_TAG="v2.1.0"
     else
         export IMAGE_TAG="$1"
 fi

app/graph.py

@@ -4,5 +4,5 @@ prettyprint
 gunicorn
 gevent
 natsort
-https://github.com/datacenter/pyaci/archive/master.zip
+cisco-pyaci
 https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz

app/requirements.txt

@@ -8243,7 +8243,7 @@ body.cui .dropdown {
   outline: none; }
   body.cui .dropdown .dropdown__menu {
     list-style: none;
-    display: inline-flex;
+    display: block;
     flex-direction: column;
     opacity: 0;
     background: var(--cui-dropdown-background-color);
@@ -8255,7 +8255,7 @@ body.cui .dropdown {
     position: absolute;
     pointer-events: auto;
     top: calc(100% + 5px);
-    height: 0;
+    height: 50px;
     width: auto;
     min-width: var(--cui-dropdown-menu-min-width);
     max-height: var(--cui-dropdown-max-height);

app/template/assets/cui-2.0.0/css/cui-standard.min.css

@@ -141,14 +141,17 @@
                               {% if asnPresent %}
                                  <a id="OnlyBgpPeers" onclick="draw_only_bgp_peers()">BGP Peers</a>
                               {% endif %}
-                              {% if sriov or macvlan %}
+                              {% if sriov or macvlan or bridge %}
                                  <a id="OnlyPrimarylinks" onclick="draw_only_primary_links()">Primary Links</a>
                                  {% if sriov %}
                                     <a id="OnlySriovlinks" onclick="draw_only_sriov_links()">SRIOV Links</a>
                                  {% endif %}
                                  {% if macvlan %}
                                     <a id="OnlyMacvlanlinks" onclick="draw_only_macvlan_links()">MacVlan Links</a>
                                  {% endif %}
+                                 {% if bridge %}
+                                    <a id="OnlyBridgelinks" onclick="draw_only_bridge_links()">Bridge Links</a>
+                                 {% endif %}
                               {% endif %}
                               <div class="dropdown__divider"></div>
                               <a id="All" onclick="draw_all()">View All</a>
@@ -526,7 +529,7 @@ <h5><em></em></h5>
       <!-- End Main Content -->
 
    </div>
-   
+
    <script src="./assets/cui-2.0.0/js/styleguide.js"></script>
    <script src="./assets/cui-2.0.0/js/neovis.js"></script>
    <script src="./assets/cui-2.0.0/js/vkaci-table.js"></script>
@@ -563,8 +566,8 @@ <h5><em></em></h5>
          if(!event.inputType) $("#podBttn").click();
       });
 
-      document.getElementById('input-label-filter').addEventListener('input', function (event) {
-         if(!event.inputType) label_values();
+      document.getElementById('input-label-filter').addEventListener('change', function (event) {
+         label_values();
       });
 
    </script>

app/template/assets/cui-2.0.0/js/vkaci.js

@@ -19,7 +19,7 @@ def index():
     return render_template('index.html', version=__build__, env=env, pod_names=topology.get_pods(), 
     node_names=topology.get_nodes(), namespaces=topology.get_namespaces(), 
     leaf_names=topology.get_leafs(), label_names=topology.get_labels(),
-    asnPresent=topology.asnPresent, sriov=topology.sriov, macvlan=topology.macvlan)
+    asnPresent=topology.asnPresent, sriov=topology.sriov, macvlan=topology.macvlan, bridge=topology.bridge)
 
 
 @app.route('/pod_names')
@@ -70,4 +70,4 @@ def regenerate():
     return redirect("/", code=302)
 
 if __name__ == '__main__':
-	app.run(debug=False, host="0.0.0.0", port=8080)
+	app.run(debug=False, host="0.0.0.0", port=8089)

app/template/index.html

@@ -16,14 +16,14 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.1.3
+version: 1.2.0
 
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.0.0"
+appVersion: "v2.1.0"
 
 maintainers:
 - email: [email protected]

app/visibility_ui.py

@@ -13,7 +13,7 @@ rules:
   resources: ["bgpconfigurations"]
   verbs: ["list","get"]
 - apiGroups: ["cilium.io"]
-  resources: ["ciliumbgppeeringpolicies"]
+  resources: ["ciliumbgpclusterconfigs"]
   verbs: ["list","get"]
 ---
 kind: ClusterRoleBinding