Refactor: resolve code smells of openstacknetworking impl pkgs #2
Change-Id: I788d328cf0f5a3673d8cad01416f5926e1ab055c
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackMetadataProxyHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackMetadataProxyHandler.java
index 9446976..66250e0 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackMetadataProxyHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackMetadataProxyHandler.java
@@ -454,9 +454,6 @@
log.info("Sending HTTP {} request to metadata endpoint {}...", method, url);
switch (method) {
- case HTTP_GET_METHOD:
- request = new HttpGet(url);
- break;
case HTTP_POST_METHOD:
request = new HttpPost(url);
HttpEntityEnclosingRequest postRequest =
@@ -472,6 +469,7 @@
case HTTP_DELETE_METHOD:
request = new HttpDelete(url);
break;
+ case HTTP_GET_METHOD:
default:
request = new HttpGet(url);
break;
@@ -532,6 +530,17 @@
ByteBuffer.wrap(ethReply.serialize())));
context.block();
}
+
+ private String metadataSecret() {
+ OpenstackNode controller = osNodeService.completeNodes(CONTROLLER)
+ .stream().findFirst().orElse(null);
+
+ if (controller != null && controller.neutronConfig() != null) {
+ return controller.neutronConfig().metadataProxySecret();
+ }
+
+ return null;
+ }
}
private class InternalNodeEventListener implements OpenstackNodeListener {
@@ -550,28 +559,10 @@
OpenstackNode osNode = event.subject();
switch (event.type()) {
case OPENSTACK_NODE_COMPLETE:
-
- eventExecutor.execute(() -> {
-
- if (!isRelevantHelper()) {
- return;
- }
-
- setMetadataRule(osNode, true);
- });
-
+ eventExecutor.execute(() -> processNodeCompletion(osNode));
break;
case OPENSTACK_NODE_INCOMPLETE:
-
- eventExecutor.execute(() -> {
-
- if (!isRelevantHelper()) {
- return;
- }
-
- setMetadataRule(osNode, false);
- });
-
+ eventExecutor.execute(() -> processNodeIncompletion(osNode));
break;
case OPENSTACK_NODE_CREATED:
case OPENSTACK_NODE_UPDATED:
@@ -581,6 +572,22 @@
}
}
+ private void processNodeCompletion(OpenstackNode osNode) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+
+ setMetadataRule(osNode, true);
+ }
+
+ private void processNodeIncompletion(OpenstackNode osNode) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+
+ setMetadataRule(osNode, false);
+ }
+
/**
* Installs metadata rule for receiving all metadata request packets.
*
@@ -622,17 +629,6 @@
return false;
}
- private String metadataSecret() {
- OpenstackNode controller = osNodeService.completeNodes(CONTROLLER)
- .stream().findFirst().orElse(null);
-
- if (controller != null && controller.neutronConfig() != null) {
- return controller.neutronConfig().metadataProxySecret();
- }
-
- return null;
- }
-
/**
* Implements Http packet format.
*/