ChefAdapterImpl junits 19/36719/3
authorMichal Kabaj <michal.kabaj@nokia.com>
Wed, 21 Mar 2018 12:26:51 +0000 (13:26 +0100)
committerTakamune Cho <tc012c@att.com>
Thu, 22 Mar 2018 14:23:52 +0000 (14:23 +0000)
- Added new Junit class ChefAdapterImplVNFCOperationsTest
- Added unit tests for method vnfcEnvironment
- Small refactor to for exception handling in vnfcEnvironment method to
improve readability and avoid catching and rethrowing same exception

Change-Id: I58a43390ff45598f6d17da48eed3620667008cb7
Issue-ID: APPC-437
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplVNFCOperationsTest.java [new file with mode: 0644]

index f689668..f5b6b67 100644 (file)
@@ -114,21 +114,18 @@ public class ChefAdapterImpl implements ChefAdapter {
     @Override
     public void vnfcEnvironment(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try {
-            logger.info("environment of VNF-C");
-            chefInfo(params, ctx);
-            RequestContext rc = new RequestContext(ctx);
-            logger.info("Context" + ctx);
-            rc.isAlive();
-            String env = params.get("Environment");
-            logger.info("Environmnet" + env);
-            if (env.equals(StringUtils.EMPTY)) {
-                chefServerResult(rc, 200, "Skip Environment block ");
-            } else {
-                JSONObject envJ = new JSONObject(env);
-                String envName = envJ.getString("name");
-                String message;
-                if (privateKeyChecker.doesExist(clientPrivatekey)) {
+        logger.info("environment of VNF-C");
+        chefInfo(params, ctx);
+        String env = params.get("Environment");
+        logger.info("Environmnet" + env);
+        if (env.equals(StringUtils.EMPTY)) {
+            chefServerResult(new RequestContext(ctx), 200, "Skip Environment block ");
+        } else {
+            String message;
+            if (privateKeyChecker.doesExist(clientPrivatekey)) {
+                try {
+                    JSONObject envJ = new JSONObject(env);
+                    String envName = envJ.getString("name");
                     // update the details of an environment on the Chef server.
                     ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
                     ChefResponse chefResponse = chefApiClient.put("/environments/" + envName, env);
@@ -141,22 +138,21 @@ public class ChefAdapterImpl implements ChefAdapter {
                         message = chefResponse.getBody();
                         logger.info("requestbody {}", chefResponse.getBody());
                     }
-
-                } else {
-                    code = 500;
-                    message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
-                    doFailure(ctx, code, message);
+                    chefServerResult(new RequestContext(ctx), code, message);
+                } catch (JSONException e) {
+                    code = 401;
+                    logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
+                    doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
+                } catch (Exception e) {
+                    code = 401;
+                    logger.error(POSTING_REQUEST_ERROR_STR, e);
+                    doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
                 }
-                chefServerResult(rc, code, message);
+            } else {
+                code = 500;
+                message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
+                doFailure(ctx, code, message);
             }
-        } catch (JSONException e) {
-            code = 401;
-            logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
-            doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
-        } catch (Exception e) {
-            code = 401;
-            logger.error(POSTING_REQUEST_ERROR_STR, e);
-            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
         }
     }
 
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplVNFCOperationsTest.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplVNFCOperationsTest.java
new file mode 100644 (file)
index 0000000..1915cf8
--- /dev/null
@@ -0,0 +1,184 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2018 Nokia. All rights reserved.
+ * =============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.appc.adapter.chef.impl;
+
+
+import static com.google.common.collect.Maps.immutableEntry;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.BDDMockito.given;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.appc.adapter.chef.chefclient.ChefApiClientFactory;
+import org.onap.appc.adapter.chef.chefclient.api.ChefApiClient;
+import org.onap.appc.adapter.chef.chefclient.api.ChefResponse;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ChefAdapterImplVNFCOperationsTest {
+
+    private static final String CLIENT_PRIVATE_KEY_PATH = "/opt/onap/appc/chef/localhost/onap/testclient.pem";
+    private static final String RESULT_CODE_ATTR_KEY = "chefServerResult.code";
+    private static final String RESULT_MESSAGE_ATTR_KEY = "chefServerResult.message";
+    private static final String USERNAME = "testclient";
+    private static final String SERVER_ADDRESS = "localhost";
+    private static final String ORGANIZATIONS = "onap";
+    private static final String ENV_PARAM_KEY = "Environment";
+    private static final String ENV_JSON_VALUE = "{name:envName}";
+    private static final String FAILURE_STATUS = "failure";
+    private static final String SUCCESS_STATUS = "success";
+    private static final String CHEF_ADAPTER_ERROR_PREFIX = "Chef Adapter error:";
+
+    @Mock
+    private PrivateKeyChecker privateKeyChecker;
+    @Mock
+    private ChefApiClientFactory chefApiClientFactory;
+    @Mock
+    private ChefApiClient chefApiClient;
+
+    @InjectMocks
+    private ChefAdapterFactory chefAdapterFactory;
+    private SvcLogicContext svcLogicContext;
+
+    @Before
+    public void setUp() {
+        svcLogicContext = new SvcLogicContext();
+    }
+
+    @Test
+    public void vnfcEnvironment_shouldSkipEnvironmentCreation_whenEnvParamIsEmpty() throws SvcLogicException {
+        // GIVEN
+        Map<String, String> params = givenInputParams(immutableEntry(ENV_PARAM_KEY, ""));
+
+        // WHEN
+        chefAdapterFactory.create().vnfcEnvironment(params, svcLogicContext);
+
+        // THEN
+        assertThat(svcLogicContext.getStatus()).isEqualTo(SUCCESS_STATUS);
+        assertThat(svcLogicContext.getAttribute(RESULT_CODE_ATTR_KEY))
+            .isEqualTo(Integer.toString(HttpStatus.SC_OK));
+        assertThat(svcLogicContext.getAttribute(RESULT_MESSAGE_ATTR_KEY)).isEqualTo("Skip Environment block ");
+    }
+
+    @Test
+    public void vnfcEnvironment_shouldCreateNewEnvironment_forEnvParam_whenRequestedEnvDoesNotExist()
+        throws SvcLogicException {
+        // GIVEN
+        String expectedErrorMessage = "New Environment Created";
+        Map<String, String> params = givenInputParams(immutableEntry(ENV_PARAM_KEY, ENV_JSON_VALUE));
+        given(privateKeyChecker.doesExist(CLIENT_PRIVATE_KEY_PATH)).willReturn(true);
+        given(chefApiClientFactory.create("https://localhost/organizations/onap", ORGANIZATIONS, USERNAME,
+            CLIENT_PRIVATE_KEY_PATH)).willReturn(chefApiClient);
+        given(chefApiClient.put("/environments/" + "envName", ENV_JSON_VALUE))
+            .willReturn(ChefResponse.create(HttpStatus.SC_NOT_FOUND, ""));
+        given(chefApiClient.post("/environments", ENV_JSON_VALUE))
+            .willReturn(ChefResponse.create(HttpStatus.SC_CREATED, expectedErrorMessage));
+
+        // WHEN
+        chefAdapterFactory.create().vnfcEnvironment(params, svcLogicContext);
+
+        // THEN
+        assertThat(svcLogicContext.getStatus()).isEqualTo(SUCCESS_STATUS);
+        assertThat(svcLogicContext.getAttribute(RESULT_CODE_ATTR_KEY))
+            .isEqualTo(Integer.toString(HttpStatus.SC_CREATED));
+        assertThat(svcLogicContext.getAttribute(RESULT_MESSAGE_ATTR_KEY)).isEqualTo(expectedErrorMessage);
+    }
+
+    @Test
+    public void vnfcEnvironment_shouldNotAttemptEnvCreation_andThrowException_whenPrivateKeyCheckFails() {
+        // GIVEN
+        String expectedErrorMsg = "Cannot find the private key in the APPC file system, please load the private key to ";
+        Map<String, String> params = givenInputParams(immutableEntry(ENV_PARAM_KEY, ENV_JSON_VALUE));
+        given(privateKeyChecker.doesExist(CLIENT_PRIVATE_KEY_PATH)).willReturn(false);
+
+        // WHEN  // THEN
+        assertThatExceptionOfType(SvcLogicException.class)
+            .isThrownBy(() -> chefAdapterFactory.create().vnfcEnvironment(params, svcLogicContext))
+            .withMessage(CHEF_ADAPTER_ERROR_PREFIX + expectedErrorMsg + CLIENT_PRIVATE_KEY_PATH);
+
+        assertThat(svcLogicContext.getStatus()).isEqualTo(FAILURE_STATUS);
+        assertThat(svcLogicContext.getAttribute(RESULT_CODE_ATTR_KEY))
+            .isEqualTo(Integer.toString(HttpStatus.SC_INTERNAL_SERVER_ERROR));
+        assertThat(svcLogicContext.getAttribute(RESULT_MESSAGE_ATTR_KEY))
+            .isEqualTo(expectedErrorMsg + CLIENT_PRIVATE_KEY_PATH);
+    }
+
+    @Test
+    public void vnfcEnvironment_shouldNotAttemptEnvCreation_andHandleJSONException_whenJSONParamsAreMalformed() {
+        // GIVEN
+        String expectedErrorMessage = "Error posting request due to invalid JSON block: ";
+        Map<String, String> params = givenInputParams(immutableEntry(ENV_PARAM_KEY, "MALFORMED_JSON"));
+        given(privateKeyChecker.doesExist(CLIENT_PRIVATE_KEY_PATH)).willReturn(true);
+
+        // WHEN  // THEN
+        assertThatExceptionOfType(SvcLogicException.class)
+            .isThrownBy(() -> chefAdapterFactory.create().vnfcEnvironment(params, svcLogicContext))
+            .withMessageStartingWith(CHEF_ADAPTER_ERROR_PREFIX + expectedErrorMessage);
+
+        assertThat(svcLogicContext.getStatus()).isEqualTo(FAILURE_STATUS);
+        assertThat(svcLogicContext.getAttribute(RESULT_CODE_ATTR_KEY))
+            .isEqualTo(Integer.toString(HttpStatus.SC_UNAUTHORIZED));
+        assertThat(svcLogicContext.getAttribute(RESULT_MESSAGE_ATTR_KEY))
+            .startsWith(expectedErrorMessage);
+    }
+
+    @Test
+    public void vnfcEnvironment_shouldNotAttemptEnvCreation_andHandleException_whenExceptionOccursDuringExecution() {
+        // GIVEN
+        String expectedErrorMessage = "Error posting request: ";
+        Map<String, String> params = givenInputParams(immutableEntry(ENV_PARAM_KEY, ENV_JSON_VALUE));
+        given(privateKeyChecker.doesExist(CLIENT_PRIVATE_KEY_PATH)).willReturn(true);
+        given(chefApiClientFactory.create("https://localhost/organizations/onap", ORGANIZATIONS, USERNAME,
+            CLIENT_PRIVATE_KEY_PATH)).willThrow(new NullPointerException("Null value encountered"));
+
+        // WHEN  // THEN
+        assertThatExceptionOfType(SvcLogicException.class)
+            .isThrownBy(() -> chefAdapterFactory.create().vnfcEnvironment(params, svcLogicContext))
+            .withMessage(CHEF_ADAPTER_ERROR_PREFIX + expectedErrorMessage + "Null value encountered");
+
+        assertThat(svcLogicContext.getStatus()).isEqualTo(FAILURE_STATUS);
+        assertThat(svcLogicContext.getAttribute(RESULT_CODE_ATTR_KEY))
+            .isEqualTo(Integer.toString(HttpStatus.SC_UNAUTHORIZED));
+        assertThat(svcLogicContext.getAttribute(RESULT_MESSAGE_ATTR_KEY)).startsWith(expectedErrorMessage);
+    }
+
+    private Map<String, String> givenInputParams(Entry<String, String>... entries) {
+        Builder<String, String> paramsBuilder = ImmutableMap.builder();
+        paramsBuilder.put("username", USERNAME)
+            .put("serverAddress", SERVER_ADDRESS)
+            .put("organizations", ORGANIZATIONS);
+
+        for (Entry<String, String> entry : entries) {
+            paramsBuilder.put(entry);
+        }
+        return paramsBuilder.build();
+    }
+}
\ No newline at end of file