Refactor: resolve code smells of openstacknetworking impl pkgs #3
Change-Id: I825e23cd16917abd4512d35222d695b268064ff7
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackRouterStore.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackRouterStore.java
index c8bd925..03e86bf 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackRouterStore.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/DistributedOpenstackRouterStore.java
@@ -272,29 +272,13 @@
public void event(MapEvent<String, Router> event) {
switch (event.type()) {
case UPDATE:
- log.debug("OpenStack router updated");
- eventExecutor.execute(() -> {
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_UPDATED,
- event.newValue().value()));
- processGatewayUpdate(event);
- });
+ eventExecutor.execute(() -> processRouterMapUpdate(event));
break;
case INSERT:
- log.debug("OpenStack router created");
- eventExecutor.execute(() ->
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_CREATED,
- event.newValue().value()))
- );
+ eventExecutor.execute(() -> processRouterMapInsertion(event));
break;
case REMOVE:
- log.debug("OpenStack router removed");
- eventExecutor.execute(() ->
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_REMOVED,
- event.oldValue().value()))
- );
+ eventExecutor.execute(() -> processRouterMapRemoval(event));
break;
default:
log.error("Unsupported openstack router event type");
@@ -302,6 +286,28 @@
}
}
+ private void processRouterMapUpdate(MapEvent<String, Router> event) {
+ log.debug("OpenStack router updated");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_UPDATED,
+ event.newValue().value()));
+ processGatewayUpdate(event);
+ }
+
+ private void processRouterMapInsertion(MapEvent<String, Router> event) {
+ log.debug("OpenStack router created");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_CREATED,
+ event.newValue().value()));
+ }
+
+ private void processRouterMapRemoval(MapEvent<String, Router> event) {
+ log.debug("OpenStack router removed");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_REMOVED,
+ event.oldValue().value()));
+ }
+
private void processGatewayUpdate(MapEvent<String, Router> event) {
ExternalGateway oldGateway = event.oldValue().value().getExternalGatewayInfo();
ExternalGateway newGateway = event.newValue().value().getExternalGatewayInfo();
@@ -326,37 +332,43 @@
public void event(MapEvent<String, RouterInterface> event) {
switch (event.type()) {
case UPDATE:
- log.debug("OpenStack router interface updated");
- eventExecutor.execute(() ->
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_INTERFACE_UPDATED,
- router(event.newValue().value().getId()),
- event.newValue().value()))
- );
+ eventExecutor.execute(() -> processRouterIntfUpdate(event));
break;
case INSERT:
- log.debug("OpenStack router interface created");
- eventExecutor.execute(() ->
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_INTERFACE_ADDED,
- router(event.newValue().value().getId()),
- event.newValue().value()))
- );
+ eventExecutor.execute(() -> processRouterIntfInsertion(event));
break;
case REMOVE:
- log.debug("OpenStack router interface removed");
- eventExecutor.execute(() ->
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_ROUTER_INTERFACE_REMOVED,
- router(event.oldValue().value().getId()),
- event.oldValue().value()))
- );
+ eventExecutor.execute(() -> processRouterIntfRemoval(event));
break;
default:
log.error("Unsupported openstack router interface event type");
break;
}
}
+
+ private void processRouterIntfUpdate(MapEvent<String, RouterInterface> event) {
+ log.debug("OpenStack router interface updated");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_INTERFACE_UPDATED,
+ router(event.newValue().value().getId()),
+ event.newValue().value()));
+ }
+
+ private void processRouterIntfInsertion(MapEvent<String, RouterInterface> event) {
+ log.debug("OpenStack router interface created");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_INTERFACE_ADDED,
+ router(event.newValue().value().getId()),
+ event.newValue().value()));
+ }
+
+ private void processRouterIntfRemoval(MapEvent<String, RouterInterface> event) {
+ log.debug("OpenStack router interface removed");
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_ROUTER_INTERFACE_REMOVED,
+ router(event.oldValue().value().getId()),
+ event.oldValue().value()));
+ }
}
private class OpenstackFloatingIpMapListener
@@ -366,44 +378,13 @@
public void event(MapEvent<String, NetFloatingIP> event) {
switch (event.type()) {
case UPDATE:
- log.debug("OpenStack floating IP updated");
- eventExecutor.execute(() -> {
- Router osRouter = Strings.isNullOrEmpty(
- event.newValue().value().getRouterId()) ?
- null :
- router(event.newValue().value().getRouterId());
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_FLOATING_IP_UPDATED,
- osRouter,
- event.newValue().value()));
- processFloatingIpUpdate(event, osRouter);
- });
+ eventExecutor.execute(() -> processFloatingIpMapUpdate(event));
break;
case INSERT:
- log.debug("OpenStack floating IP created");
- eventExecutor.execute(() -> {
- Router osRouter = Strings.isNullOrEmpty(
- event.newValue().value().getRouterId()) ?
- null :
- router(event.newValue().value().getRouterId());
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_FLOATING_IP_CREATED,
- osRouter,
- event.newValue().value()));
- });
+ eventExecutor.execute(() -> processFloatingIpMapInsertion(event));
break;
case REMOVE:
- log.debug("OpenStack floating IP removed");
- eventExecutor.execute(() -> {
- Router osRouter = Strings.isNullOrEmpty(
- event.oldValue().value().getRouterId()) ?
- null :
- router(event.oldValue().value().getRouterId());
- notifyDelegate(new OpenstackRouterEvent(
- OPENSTACK_FLOATING_IP_REMOVED,
- osRouter,
- event.oldValue().value()));
- });
+ eventExecutor.execute(() -> processFloatingIpMapRemoval(event));
break;
default:
log.error("Unsupported openstack floating IP event type");
@@ -411,6 +392,43 @@
}
}
+ private void processFloatingIpMapUpdate(MapEvent<String, NetFloatingIP> event) {
+ log.debug("OpenStack floating IP updated");
+ Router osRouter = Strings.isNullOrEmpty(
+ event.newValue().value().getRouterId()) ?
+ null :
+ router(event.newValue().value().getRouterId());
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_FLOATING_IP_UPDATED,
+ osRouter,
+ event.newValue().value()));
+ processFloatingIpUpdate(event, osRouter);
+ }
+
+ private void processFloatingIpMapInsertion(MapEvent<String, NetFloatingIP> event) {
+ log.debug("OpenStack floating IP created");
+ Router osRouter = Strings.isNullOrEmpty(
+ event.newValue().value().getRouterId()) ?
+ null :
+ router(event.newValue().value().getRouterId());
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_FLOATING_IP_CREATED,
+ osRouter,
+ event.newValue().value()));
+ }
+
+ private void processFloatingIpMapRemoval(MapEvent<String, NetFloatingIP> event) {
+ log.debug("OpenStack floating IP removed");
+ Router osRouter = Strings.isNullOrEmpty(
+ event.oldValue().value().getRouterId()) ?
+ null :
+ router(event.oldValue().value().getRouterId());
+ notifyDelegate(new OpenstackRouterEvent(
+ OPENSTACK_FLOATING_IP_REMOVED,
+ osRouter,
+ event.oldValue().value()));
+ }
+
private void processFloatingIpUpdate(MapEvent<String, NetFloatingIP> event,
Router osRouter) {
String oldPortId = event.oldValue().value().getPortId();