Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

18 files changed, 87 insertions, 317 deletions

diff --git a/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java
new file mode 100644
index 0000000000..ec3741dc1a
--- /dev/null
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/exceptions/ApplicationExceptionTest.java
@@ -0,0 +1,42 @@
+/*
+* ============LICENSE_START=======================================================
+ * ONAP : SO
+ * ================================================================================
+ * Copyright (C) 2018 TechMahindra
+ * ================================================================================
+ * 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.so.adapters.vfc.exceptions;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ApplicationExceptionTest {
+	private ApplicationException application = new ApplicationException(0,null);
+	
+	@Test
+	public void testApplicationException() {
+		application.setErrorCode(0);
+		application.setErrorMsg("ErrorMsg");
+		assertEquals(application.getErrorCode(), 0);
+		assertEquals(application.getErrorMsg(), "ErrorMsg");	
+	}
+	
+	@Test
+	public void testbuildErrorResponse(){
+		assert(application.buildErrorResponse()!=null);
+	}
+}
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/CustomerModelTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java
index 293c037eca..2acd6c25ad 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/CustomerModelTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/CustomerModelTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/LocationConstraintTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java
index e4b275cd41..ef5eb2617e 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/LocationConstraintTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/LocationConstraintTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameterTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java
index 3e6aeded20..2e720e47ad 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameterTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NSResourceInputParameterTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsCreateReqTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java
index 56a06173e0..caf2d7e164 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsCreateReqTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsCreateReqTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsInstantiateReqTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java
index d63748d9dd..330e34d0cc 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsInstantiateReqTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsInstantiateReqTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsOperationKeyTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java
index 79b5fb2b57..e315eefbcc 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsOperationKeyTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsOperationKeyTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsParametersTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java
index 512c061e6d..852bac29a1 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsParametersTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsParametersTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsProgressStatusTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java
index 2569631db3..e99d9aef38 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/NsProgressStatusTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/NsProgressStatusTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/ResponseDescriptorTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java
index 0bfb0df6e3..a9f2f4ce3c 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/ResponseDescriptorTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/ResponseDescriptorTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/RestfulResponseTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java
index 5117e73ac2..61ddac2707 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/RestfulResponseTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/RestfulResponseTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.adapters.vfc.model;
+package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/VimLocationTest.java b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java
index d3da7f6b3a..e9b250717d 100644
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/model/VimLocationTest.java
+++ b/adapters/mso-vfc-adapter/src/test/java/org/onap/so/adapters/vfc/model/VimLocationTest.java
@@ -8,16 +8,16 @@
  * 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.openecomp.mso.adapters.vfc.model;
+ */package org.onap.so.adapters.vfc.model;
 
 import org.junit.Test;
 
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/VfcAdapterTest.java b/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/VfcAdapterTest.java
deleted file mode 100644
index 759ceedd0f..0000000000
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/VfcAdapterTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapters.vfc;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.mso.adapters.vfc.constant.CommonConstant;
-import org.openecomp.mso.adapters.vfc.constant.HttpCode;
-import org.openecomp.mso.adapters.vfc.model.RestfulResponse;
-import org.openecomp.mso.adapters.vfc.util.RestfulUtil;
-import org.openecomp.mso.adapters.vfc.util.ValidateUtil;
-import org.openecomp.mso.requestsdb.RequestsDatabase;
-import org.openecomp.mso.requestsdb.ResourceOperationStatus;
-
-import mockit.Mock;
-import mockit.MockUp;
-
-/**
- * VF-C adapter UT <br>
- * <p>
- * </p>
- * 
- * @author
- * @version ONAP Amsterdam Release 2017-08-31
- */
-public class VfcAdapterTest {
-
-    private VfcAdapterRest vfcAdapter = new VfcAdapterRest();
-
-    /**
-     * File path
-     */
-    private static final String FILE_PATH = "src/test/resources/json/";
-
-    /**
-     * mock get request body <br>
-     * 
-     * @param fileName
-     * @return
-     * @since ONAP Amsterdam Release
-     */
-    public String getRequestBody(String fileName) {
-        return getJsonString(fileName);
-    }
-
-    /**
-     * Mock the request body form a file <br>
-     * 
-     * @since ONAP Amsterdam Release
-     */
-    private void mockRestfulUtil() {
-        new MockUp<RestfulUtil>() {
-
-            /**
-             * mock get send method <br>
-             * 
-             * @param url
-             * @param methodType
-             * @param content
-             * @return
-             * @since ONAP Amsterdam Release
-             */
-            @Mock
-            public RestfulResponse send(String url, String methodType, String content) {
-                if(url.equals(CommonConstant.NFVO_CREATE_URL) && methodType.equals(CommonConstant.MethodType.POST)) {
-                    return getResponse("createNsRsp.json");
-                } else if(url.contains("instantiate") && methodType.equals(CommonConstant.MethodType.POST)) {
-                    return getResponse("instantiateNsRsp.json");
-                } else if(methodType.equals(CommonConstant.MethodType.DELETE)) {
-                    return getResponse(null);
-                } else if(url.contains("terminate") && methodType.equals(CommonConstant.MethodType.POST)) {
-                    return getResponse("terminateNsRsp.json");
-                } else if(url.contains("/api/nslcm/v1/jobs") && methodType.equals(CommonConstant.MethodType.GET)) {
-                    return getResponse("queryJobRsp.json");
-                } else {
-                    return null;
-                }
-            }
-        };
-    }
-
-    /**
-     * Mock the request body form a file <br>
-     * 
-     * @param fileName
-     * @since ONAP Amsterdam Release
-     */
-    private void mockRequestDatabase() {
-        new MockUp<RequestsDatabase>() {
-
-            /**
-             * mock get resource operation status <br>
-             * 
-             * @param request
-             * @return
-             * @since ONAP Amsterdam Release
-             */
-            @Mock
-            public ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId,
-                    String resourceTemplateUUID) {
-                ResourceOperationStatus resStatus = new ResourceOperationStatus();
-                resStatus.setServiceId("111");
-                resStatus.setOperationId("111");
-                return resStatus;
-            }
-
-            /**
-             * Mock update Res Oper Status <br>
-             * 
-             * @param operStatus
-             * @since ONAP Amsterdam Release
-             */
-            @Mock
-            public void updateResOperStatus(ResourceOperationStatus operStatus) {
-
-            }
-        };
-    }
-
-    /**
-     * Before executing UT, start mock requst database <br>
-     * 
-     * @since ONAP Amsterdam Release
-     */
-    @Before
-    public void start() {
-        mockRequestDatabase();
-        mockRestfulUtil();
-    }
-
-    /**
-     * After executing UT, close session<br/>
-     * 
-     * @since ONAP Amsterdam Release
-     */
-    @After
-    public void stop() {
-
-    }
-
-    @Test
-    public void createTest() {
-        // get request
-        String createReq = getRequestBody(FILE_PATH + "createNsReq.json");
-        vfcAdapter.createNfvoNs(createReq);
-    }
-
-    @Test
-    public void deleteTest() {
-        // get request
-        String req = getRequestBody(FILE_PATH + "deleteNsReq.json");
-        vfcAdapter.deleteNfvoNs(req, "9b9f02c0-298b-458a-bc9c-be3692e4f354");
-    }
-
-    @Test
-    public void instantiateTest() {
-        // get request
-        String req = getRequestBody(FILE_PATH + "instantiateNsReq.json");
-        vfcAdapter.instantiateNfvoNs(req, "9b9f02c0-298b-458a-bc9c-be3692e4f354");
-    }
-
-    @Test
-    public void terminateTest() {
-        String req = getRequestBody(FILE_PATH + "terminateNsReq.json");
-        vfcAdapter.deleteNfvoNs(req, "9b9f02c0-298b-458a-bc9c-be3692e4f354");
-    }
-
-    @Test
-    public void queryJobTest() {
-        String req = getRequestBody(FILE_PATH + "queryJobReq.json");
-        vfcAdapter.queryNfvoJobStatus(req, "1");
-    }
-
-    /**
-     * Get json string from file.<br/>
-     * 
-     * @param file the path of file
-     * @return json string
-     * @throws IOException when fail to read
-     * @since ONAP Amsterdam Release 2017-9-6
-     */
-    @SuppressWarnings("deprecation")
-    private String getJsonString(final String file) {
-        if(ValidateUtil.isStrEmpty(file)) {
-            return "";
-        }
-
-        String json = null;
-        try {
-            FileInputStream fileStream = new FileInputStream(new File(file));
-            json = IOUtils.toString(fileStream);
-        } catch(Exception e) {
-            Assert.fail(e.getMessage());
-        }
-        return json;
-    }
-
-    /**
-     * get the response from file <br>
-     * 
-     * @param fileName
-     * @return
-     * @since ONAP Amsterdam Release
-     */
-    private RestfulResponse getResponse(String fileName) {
-        RestfulResponse responseSuccess = new RestfulResponse();
-        responseSuccess.setStatus(HttpCode.RESPOND_OK);
-        if(null != fileName) {
-            String jsonStr = getJsonString(FILE_PATH + fileName);
-            responseSuccess.setResponseContent(jsonStr);
-        }
-        return responseSuccess;
-    }
-}
diff --git a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/exceptions/ApplicationExceptionTest.java b/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/exceptions/ApplicationExceptionTest.java
deleted file mode 100644
index 231e210bbe..0000000000
--- a/adapters/mso-vfc-adapter/src/test/java/org/openecomp/mso/adapters/vfc/exceptions/ApplicationExceptionTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

-* ============LICENSE_START=======================================================

-* ONAP : SO

-* ================================================================================

-* Copyright 2018 TechMahindra

-*=================================================================================

-* 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.openecomp.mso.adapters.vfc.exceptions;

-

-import static org.junit.Assert.*;

-

-import org.junit.Test;

-

-public class ApplicationExceptionTest {

-	private ApplicationException application = new ApplicationException(0,null);

-	

-	@Test

-	public void testApplicationException() {

-		application.setErrorCode(0);

-		application.setErrorMsg("ErrorMsg");

-		assertEquals(application.getErrorCode(), 0);

-		assertEquals(application.getErrorMsg(), "ErrorMsg");	

-	}

-	

-	@Test

-	public void testbuildErrorResponse(){

-		assert(application.buildErrorResponse()!=null);

-	}

-}

diff --git a/adapters/mso-vfc-adapter/src/test/resources/application-test.yaml b/adapters/mso-vfc-adapter/src/test/resources/application-test.yaml
new file mode 100644
index 0000000000..ab5fa612eb
--- /dev/null
+++ b/adapters/mso-vfc-adapter/src/test/resources/application-test.yaml
@@ -0,0 +1,6 @@
+mso:
+  site-name: localSite
+  msb-ip: "127.0.0.1"
+  msb-port: 8080
+
+
diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json b/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
index 9534e5ece5..047c81081e 100644
--- a/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
@@ -19,7 +19,7 @@
         ],
         "additionalParamForNs":{
             "externalDataNetworkName":"Flow_out_net",
-            "m6000_mng_ip":"181.18.20.2",
+            "m6000_mng_ip":"192.168.20.2",
             "externalCompanyFtpDataNetworkName":"Flow_out_net",
             "externalPluginManageNetworkName":"plugin_net_2014",
             "externalManageNetworkName":"mng_net_2017",
diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/instantiateNsReq.json b/adapters/mso-vfc-adapter/src/test/resources/json/instantiateNsReq.json
index 9534e5ece5..047c81081e 100644
--- a/adapters/mso-vfc-adapter/src/test/resources/json/instantiateNsReq.json
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/instantiateNsReq.json
@@ -19,7 +19,7 @@
         ],
         "additionalParamForNs":{
             "externalDataNetworkName":"Flow_out_net",
-            "m6000_mng_ip":"181.18.20.2",
+            "m6000_mng_ip":"192.168.20.2",
             "externalCompanyFtpDataNetworkName":"Flow_out_net",
             "externalPluginManageNetworkName":"plugin_net_2014",
             "externalManageNetworkName":"mng_net_2017",
diff --git a/adapters/mso-vfc-adapter/src/test/resources/logback-test.xml b/adapters/mso-vfc-adapter/src/test/resources/logback-test.xml
index 61d9c45543..c2e0098f5a 100644
--- a/adapters/mso-vfc-adapter/src/test/resources/logback-test.xml
+++ b/adapters/mso-vfc-adapter/src/test/resources/logback-test.xml
@@ -30,7 +30,10 @@
 	<logger name="com.att.eelf.error" level="trace" additivity="false">
 		<appender-ref ref="STDOUT" />
 	</logger>
-
+	<logger name="org.onap" level="${so.log.level:-DEBUG}"
+		additivity="false">
+		<appender-ref ref="STDOUT" />
+	</logger>
 	<root level="info">
 		<appender-ref ref="STDOUT" />
 	</root>