Fix NSX rest client to not reset execution counter after a login

miguelaferreira · miguelaferreira · commit cfe14462a338 · 2015-12-05T15:52:22.000+01:00
diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java
@@ -90,7 +90,7 @@ private CloseableHttpResponse execute(final HttpUriRequest request, final int pr
         if (HttpStatusCodeHelper.isUnauthorized(statusCode)) {
             return handleUnauthorizedResponse(request, previousStatusCode, response, statusCode);
         } else if (HttpStatusCodeHelper.isSuccess(statusCode)) {
-            return handleSuccessResponse(response);
+            return handleSuccessResponse(request, response);
         } else {
             throw new CloudstackRESTException("Unexpecetd status code: " + statusCode);
         }
@@ -110,8 +110,10 @@ private CloseableHttpResponse handleUnauthorizedResponse(final HttpUriRequest re
         return execute(request, loginStatusCode);
     }
 
-    private CloseableHttpResponse handleSuccessResponse(final CloseableHttpResponse response) {
-        counter.resetExecutionCounter();
+    private CloseableHttpResponse handleSuccessResponse(final HttpUriRequest request, final CloseableHttpResponse response) {
+        if (!request.getURI().getPath().contains(loginUrl)) {
+            counter.resetExecutionCounter();
+        }
         return response;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private CloseableHttpResponse execute(final HttpUriRequest request, final int pr`
`90`	`90`	`if (HttpStatusCodeHelper.isUnauthorized(statusCode)) {`
`91`	`91`	`return handleUnauthorizedResponse(request, previousStatusCode, response, statusCode);`
`92`	`92`	`} else if (HttpStatusCodeHelper.isSuccess(statusCode)) {`
`93`		`- return handleSuccessResponse(response);`
	`93`	`+ return handleSuccessResponse(request, response);`
`94`	`94`	`} else {`
`95`	`95`	`throw new CloudstackRESTException("Unexpecetd status code: " + statusCode);`
`96`	`96`	`}`
`@@ -110,8 +110,10 @@ private CloseableHttpResponse handleUnauthorizedResponse(final HttpUriRequest re`
`110`	`110`	`return execute(request, loginStatusCode);`
`111`	`111`	`}`
`112`	`112`
`113`		`- private CloseableHttpResponse handleSuccessResponse(final CloseableHttpResponse response) {`
`114`		`- counter.resetExecutionCounter();`
	`113`	`+ private CloseableHttpResponse handleSuccessResponse(final HttpUriRequest request, final CloseableHttpResponse response) {`
	`114`	`+ if (!request.getURI().getPath().contains(loginUrl)) {`
	`115`	`+ counter.resetExecutionCounter();`
	`116`	`+ }`
`115`	`117`	`return response;`
`116`	`118`	`}`
`117`	`119`