Add node IP attribute in k8s node class with minor code refactoring
Change-Id: I4c1c86c95acfeb38569b91c1677e4ce8af90460f
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sApiConfigHandler.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sApiConfigHandler.java
index bf81f85a..30606f0 100644
--- a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sApiConfigHandler.java
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sApiConfigHandler.java
@@ -203,6 +203,7 @@
String hostname = node.getMetadata().getName();
IpAddress managementIp = null;
IpAddress dataIp = null;
+ IpAddress nodeIp = null;
// pass-through mode: we use host IP as the management and data IP
// normal mode: we use K8S node's internal IP as the management and data IP
@@ -215,11 +216,17 @@
managementIp = info.hostIp();
dataIp = info.hostIp();
}
+ for (NodeAddress nodeAddress:node.getStatus().getAddresses()) {
+ if (nodeAddress.getType().equals(INTERNAL_IP)) {
+ nodeIp = IpAddress.valueOf(nodeAddress.getAddress());
+ }
+ }
} else {
for (NodeAddress nodeAddress:node.getStatus().getAddresses()) {
if (nodeAddress.getType().equals(INTERNAL_IP)) {
managementIp = IpAddress.valueOf(nodeAddress.getAddress());
dataIp = IpAddress.valueOf(nodeAddress.getAddress());
+ nodeIp = IpAddress.valueOf(nodeAddress.getAddress());
}
}
}
@@ -267,6 +274,7 @@
.hostname(hostname)
.managementIp(managementIp)
.dataIp(dataIp)
+ .nodeIp(nodeIp)
.extIntf(extIntf)
.type(nodeType)
.segmentId(config.segmentId())