Support tenant overlay network mode at kubevirt networking
Change-Id: Ife40e40e3ee5e342ac8b90ddea6eb81744ace18a
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java
index d9076da..a5379e8 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java
@@ -155,12 +155,6 @@
return;
}
- KubernetesClient client = k8sClient(kubevirtApiConfigService);
-
- if (client == null) {
- return;
- }
-
Map<String, String> annots = pod.getMetadata().getAnnotations();
if (annots == null) {
return;
@@ -206,12 +200,6 @@
return;
}
- KubernetesClient client = k8sClient(kubevirtApiConfigService);
-
- if (client == null) {
- return;
- }
-
KubevirtPort port = getPort(kubevirtNetworkAdminService.networks(), pod);
if (port == null) {
return;
@@ -244,6 +232,12 @@
Map<String, String> annots = pod.getMetadata().getAnnotations();
annots.put(NETWORK_STATUS_KEY, networkStatus.toString(4));
+ KubernetesClient client = k8sClient(kubevirtApiConfigService);
+
+ if (client == null) {
+ return;
+ }
+
client.pods().inNamespace(pod.getMetadata().getNamespace())
.withName(pod.getMetadata().getName())
.edit(r -> new PodBuilder(r)
@@ -263,12 +257,6 @@
return;
}
- KubernetesClient client = k8sClient(kubevirtApiConfigService);
-
- if (client == null) {
- return;
- }
-
KubevirtPort port = getPort(kubevirtNetworkAdminService.networks(), pod);
if (port == null) {
return;