commit f868cd54594aa21003d84bfc7be37742a5e17a78
author Jian Li <pyguni@gmail.com> Fri Feb 19 10:28:01 2021 +0900
committer Jian Li <pyguni@gmail.com> Fri Feb 19 10:28:01 2021 +0900
tree bec191508088b0d3c41f2201dc188f3d58a9af48
parent 81bd46b5924572a958047cca5902fe8431a506d8

Fix: refer to services inside each method to avoid SNF exception

Change-Id: I5b668224962874948b0670cb698be1736ddf4e58

apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java

diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
index 137fc11..c28bc94 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
@@ -70,8 +70,6 @@
     private static final String HOST_NAME = "hostname";
     private static final String ERROR_MESSAGE = " cannot be null";
 
-    private final KubevirtNodeAdminService nodeAdminService = get(KubevirtNodeAdminService.class);
-
     @Context
     private UriInfo uriInfo;
 
@@ -89,10 +87,12 @@
     public Response createNodes(InputStream input) {
         log.trace(String.format(MESSAGE_NODE, CREATE));
 
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+
         readNodeConfiguration(input).forEach(node -> {
-            KubevirtNode existing = nodeAdminService.node(node.hostname());
+            KubevirtNode existing = service.node(node.hostname());
             if (existing == null) {
-                nodeAdminService.createNode(node);
+                service.createNode(node);
             }
         });
 
@@ -117,14 +117,15 @@
     public Response updateNodes(InputStream input) {
         log.trace(String.format(MESSAGE_NODE, UPDATE));
 
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
         Set<KubevirtNode> nodes = readNodeConfiguration(input);
         for (KubevirtNode node: nodes) {
-            KubevirtNode existing = nodeAdminService.node(node.hostname());
+            KubevirtNode existing = service.node(node.hostname());
             if (existing == null) {
                 log.warn("There is no node configuration to update : {}", node.hostname());
                 return Response.notModified().build();
             } else if (!existing.equals(node)) {
-                nodeAdminService.updateNode(node);
+                service.updateNode(node);
             }
         }
 
@@ -145,14 +146,15 @@
     public Response deleteNode(@PathParam("hostname") String hostname) {
         log.trace(String.format(MESSAGE_NODE, REMOVE));
 
-        KubevirtNode existing = nodeAdminService.node(
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+        KubevirtNode existing = service.node(
                 nullIsIllegal(hostname, HOST_NAME + ERROR_MESSAGE));
 
         if (existing == null) {
             log.warn("There is no node configuration to delete : {}", hostname);
             return Response.notModified().build();
         } else {
-            nodeAdminService.removeNode(hostname);
+            service.removeNode(hostname);
         }
 
         return Response.noContent().build();
@@ -170,7 +172,8 @@
     public Response stateOfNode(@PathParam("hostname") String hostname) {
         log.trace(String.format(MESSAGE_NODE, QUERY));
 
-        KubevirtNode node = nodeAdminService.node(hostname);
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+        KubevirtNode node = service.node(hostname);
         String nodeState = node != null ? node.state().toString() : NOT_EXIST;
 
         return ok(mapper().createObjectNode().put(STATE, nodeState)).build();
@@ -188,13 +191,14 @@
     public Response initNode(@PathParam("hostname") String hostname) {
         log.trace(String.format(MESSAGE_NODE, QUERY));
 
-        KubevirtNode node = nodeAdminService.node(hostname);
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+        KubevirtNode node = service.node(hostname);
         if (node == null) {
             log.error("Given node {} does not exist", hostname);
             return Response.serverError().build();
         }
         KubevirtNode updated = node.updateState(KubevirtNodeState.INIT);
-        nodeAdminService.updateNode(updated);
+        service.updateNode(updated);
         return ok(mapper().createObjectNode()).build();
     }
 
@@ -209,10 +213,12 @@
     public Response initAllNodes() {
         log.trace(String.format(MESSAGE_NODE, QUERY));
 
-        nodeAdminService.nodes()
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+
+        service.nodes()
                 .forEach(n -> {
                     KubevirtNode updated = n.updateState(KubevirtNodeState.INIT);
-                    nodeAdminService.updateNode(updated);
+                    service.updateNode(updated);
                 });
 
         return ok(mapper().createObjectNode()).build();
@@ -229,11 +235,12 @@
     public Response initIncompleteNodes() {
         log.trace(String.format(MESSAGE_NODE, QUERY));
 
-        nodeAdminService.nodes().stream()
+        KubevirtNodeAdminService service = get(KubevirtNodeAdminService.class);
+        service.nodes().stream()
                 .filter(n -> n.state() != KubevirtNodeState.COMPLETE)
                 .forEach(n -> {
                     KubevirtNode updated = n.updateState(KubevirtNodeState.INIT);
-                    nodeAdminService.updateNode(updated);
+                    service.updateNode(updated);
                 });
 
         return ok(mapper().createObjectNode()).build();