From b7a9cd2d6dd5c10c5eae68db322eaadaa5cc675c Mon Sep 17 00:00:00 2001 From: Hyunsun Moon Date: Fri, 24 Feb 2017 11:12:53 +0900 Subject: [PATCH] Handle PORT_REMOVED event when a VM removes Also fixed OpenStack port event log Change-Id: I0ad4a014dcb3a1fdf7ada7eb93ec80f23f42b087 --- .../openstacknetworking/impl/OpenstackNetworkManager.java | 4 ++-- .../impl/OpenstackSwitchingHostProvider.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java index 2517510a5d..b4860907b0 100644 --- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java @@ -189,7 +189,7 @@ public class OpenstackNetworkManager checkArgument(!Strings.isNullOrEmpty(osPort.getNetworkId()), ERR_NULL_PORT_NET_ID); osNetworkStore.updatePort(osPort); - log.info(String.format(MSG_SUBNET, osPort.getId(), MSG_UPDATED)); + log.info(String.format(MSG_PORT, osPort.getId(), MSG_UPDATED)); } @Override @@ -202,7 +202,7 @@ public class OpenstackNetworkManager } Port osPort = osNetworkStore.removePort(portId); if (osPort != null) { - log.info(String.format(MSG_SUBNET, osPort.getId(), MSG_REMOVED)); + log.info(String.format(MSG_PORT, osPort.getId(), MSG_REMOVED)); } } } diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java index fe07b9dbdb..8ed5785ce8 100644 --- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java @@ -239,6 +239,13 @@ public final class OpenstackSwitchingHostProvider extends AbstractProvider imple processPortAdded(event.port()); }); break; + case PORT_REMOVED: + deviceEventExecutor.execute(() -> { + log.debug("Instance port {} is removed from {}", + event.port().annotations().value(PORT_NAME), + event.subject().id()); + processPortRemoved(event.port()); + }); default: break; }