Merge pull request #50 from noironetworks/abhi-changes

Changes to support Telco requirements - For any questions or issues Please Contact @camrossi, @abhis2112.

app/Dockerfile

@@ -4,4 +4,4 @@ ENV PATH "$PATH:/app"
 COPY requirements.txt requirements.txt
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing g++ gcc make && pip3 install -r requirements.txt
 COPY . .
-RUN chmod +x /app/*
+RUN chmod +x /app/*

app/init.py

@@ -2,6 +2,7 @@
 import logging
 import os
 import urllib3
+
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 # PyACI requires to have the MetaData present locally. Since the metada changes depending on the APIC version I use an init container to pull it. 
 # No you can't put it in the same container as the moment you try to import pyaci it crashed is the metadata is not there. Plus init containers are cool!
@@ -24,6 +25,7 @@
 
 url = "https://" + os.environ.get("APIC_IPS").split(',')[0] + '/acimeta/aci-meta.json'
 r = requests.get(url, verify=False, allow_redirects=True)
+
 if os.environ.get("MODE") == "LOCAL":
     open('/tmp/aci-meta-vkaci.json','wb').write(r.content)
 else:

app/template/index.html

@@ -134,9 +134,22 @@
                            <button class="btn btn--white btn--dropdown selected view">Different Views</button>
                            <div id="selected_views" class="dropdown__menu dropdown__menu--openleft">
                               <a id="PodsAndNodes" onclick="draw_pods_and_nodes()">Pods & Nodes</a>
-                              <a id="WithoutBgpPeers" onclick="draw_without_bgp_peers()">Without Bgp Peers</a>
+                              {% if asnPresent %}
+                                 <a id="WithoutBgpPeers" onclick="draw_without_bgp_peers()">Without Bgp Peers</a>
+                              {% endif %}
                               <a id="WithoutPods" onclick="draw_without_pods()">Without Pods</a>
-                              <a id="OnlyBgpPeers" onclick="draw_only_bgp_peers()">BGP Peers</a>
+                              {% if asnPresent %}
+                                 <a id="OnlyBgpPeers" onclick="draw_only_bgp_peers()">BGP Peers</a>
+                              {% endif %}
+                              {% if sriov or macvlan %}
+                                 <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 %}
+                              {% endif %}
                               <div class="dropdown__divider"></div>
                               <a id="All" onclick="draw_all()">View All</a>
                            </div>
@@ -271,7 +284,9 @@
                            <div id="selected_table" class="dropdown__menu dropdown__menu--openleft">
                               <a id="LeafsAndPods" onclick="table_leafs_pods()">Leafs & Pods</a>
                               <a id="LeafsAndNodes" onclick="table_leafs_nodes()">Leafs & Nodes</a>
-                              <a id="BgpPeers" onclick="table_bgp_peers()">BGP Peers</a>
+                              {% if asnPresent %}
+                                 <a id="BgpPeers" onclick="table_bgp_peers()">BGP Peers</a>
+                              {% endif %}
                               <a id="Services" onclick="table_services()">Services</a>
                               <div class="dropdown__divider"></div>
                               <a id="All" onclick="table_all()">View All</a>

app/visibility_ui.py

@@ -19,7 +19,8 @@ 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)
+    asnPresent=topology.asnPresent, sriov=topology.sriov, macvlan=topology.macvlan)
+
 
 @app.route('/pod_names')
 def pod_names():

helm/templates/nfna_clusterrole.yaml

@@ -0,0 +1,31 @@
+# Add permission to list the nodefabricnetworkattachments
+{{- if .Values.cno }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: "{{ include "vkaci.fullname" . }}-nodefabricnetworkattachments-reader"
+  labels:
+    {{- include "vkaci.labels" . | nindent 4 }}
+  namespace: aci-containers-system
+rules:
+  - apiGroups: ["aci.fabricattachment"]
+    resources: ["nodefabricnetworkattachments"]
+    verbs: ["get", "watch", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: "{{ include "vkaci.fullname" . }}-nodefabricnetworkattachments-binding"
+  labels:
+    {{- include "vkaci.labels" . | nindent 4 }}
+  namespace: aci-containers-system
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "vkaci.fullname" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  # "roleRef" specifies the binding to a Role / ClusterRole
+  kind: Role # this must be Role or ClusterRole
+  name: {{ include "vkaci.fullname" . }}-nodefabricnetworkattachments-reader # this must match the name of the Role or ClusterRole you wish to bind to
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}

helm/values.yaml

@@ -111,4 +111,6 @@ lldpd:
   image:
     repository: ghcr.io/lldpd/lldpd
     tag: latest
-    pullPolicy: Always
+    pullPolicy: Always
+
+cno: false