Minor fix on floating IP and SNAT feature at kubevirt networking
Change-Id: If45de2d83cf9c43105ad776767bb19c89636e5fa
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtFloatingIpHandler.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtFloatingIpHandler.java
index 726abf2..26e27ff 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtFloatingIpHandler.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtFloatingIpHandler.java
@@ -297,7 +297,6 @@
install);
}
-
private void setFloatingIpDownstreamRulesToGatewayTunBridge(KubevirtRouter router,
KubevirtFloatingIp floatingIp,
KubevirtNetwork network,
@@ -316,6 +315,7 @@
log.warn("Failed to install floating Ip rules for floating ip {} " +
"because fail to fine the worker node that the associated port is running on",
floatingIp.floatingIp());
+ return;
}
PortNumber tunnelPortNumber = tunnelPort(electedGw, network);
@@ -323,7 +323,6 @@
return;
}
-
TrafficSelector.Builder sBuilder = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPDst(IpPrefix.valueOf(port.ipAddress(), 32))
@@ -357,15 +356,6 @@
@Override
public void event(KubevirtRouterEvent event) {
switch (event.type()) {
- case KUBEVIRT_ROUTER_CREATED:
- eventExecutor.execute(() -> processRouterCreation(event.subject()));
- break;
- case KUBEVIRT_ROUTER_UPDATED:
- eventExecutor.execute(() -> processRouterUpdate(event.subject()));
- break;
- case KUBEVIRT_ROUTER_REMOVED:
- eventExecutor.execute(() -> processRouterDeletion(event.subject()));
- break;
case KUBEVIRT_FLOATING_IP_ASSOCIATED:
eventExecutor.execute(() -> processFloatingIpAssociation(event.subject(),
event.floatingIp()));
@@ -381,42 +371,6 @@
}
}
- private void processRouterCreation(KubevirtRouter router) {
- if (!isRelevantHelper()) {
- return;
- }
- kubevirtRouterService.floatingIpsByRouter(router.name())
- .stream()
- .filter(fip -> fip.fixedIp() != null)
- .forEach(fip -> {
- processFloatingIpAssociation(router, fip);
- });
- }
-
- private void processRouterDeletion(KubevirtRouter router) {
- if (!isRelevantHelper()) {
- return;
- }
- kubevirtRouterService.floatingIpsByRouter(router.name())
- .stream()
- .filter(fip -> fip.fixedIp() != null)
- .forEach(fip -> {
- processFloatingIpDisassociation(router, fip);
- });
- }
-
- private void processRouterUpdate(KubevirtRouter router) {
- if (!isRelevantHelper()) {
- return;
- }
- kubevirtRouterService.floatingIpsByRouter(router.name())
- .stream()
- .filter(fip -> fip.fixedIp() != null)
- .forEach(fip -> {
- processFloatingIpAssociation(router, fip);
- });
- }
-
private void processFloatingIpAssociation(KubevirtRouter router, KubevirtFloatingIp floatingIp) {
if (!isRelevantHelper()) {
return;