-package org.onap.appc.interfaces.service.executor;
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2019 Ericsson
+ * ================================================================================
+ * 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.interfaces.service.executor;
public class ExecutorException extends Exception{
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
+ * ================================================================================
* 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
private static final EELFLogger log = EELFManager.getInstance().getLogger(ServiceExecutorImpl.class);
private AAIClient aaiClient;
+
public String isRequestOverLap(String requestData) throws Exception {
String response = "\"requestOverlap\" : ";
log.info("Response from ServiceExecutorImpl");
- ScopeOverlap scopeOverlap = new ScopeOverlap();
- ObjectMapper mapper = new ObjectMapper();
- scopeOverlap = mapper.readValue(requestData, ScopeOverlap.class);
+ ObjectMapper mapper = getObjectMapper();
+ ScopeOverlap scopeOverlap = mapper.readValue(requestData, ScopeOverlap.class);
// return response + String.valueOf(checkForOverLap(scopeOverlap));
boolean isOverlap = checkForOverLap(scopeOverlap);
scopeOverlap.setOverlap(String.valueOf(isOverlap));
}else if ( scopeOverlap.getInProgressRequest().isEmpty()){
return Boolean.FALSE;
}
- else if (scopeOverlap.getInProgressRequest().size() == 0) {
- return Boolean.FALSE;
- }
if (scopeOverlap.getCurrentRequest().getActionIdentifiers().getVnfId() != null) {
return Boolean.TRUE;
} else if (!Strings.isNullOrEmpty(scopeOverlap.getVnfId())
}
private boolean isVnfcNameOverLap(ScopeOverlap scopeOverlap) throws Exception {
-
- AaiService aaiService =new AaiService(aaiClient);
- SvcLogicContext ctx = new SvcLogicContext();
+
+ AaiService aaiService = getAaiService(aaiClient);
+ SvcLogicContext ctx = getSvcLogicContext();
Map<String, String> params = new HashMap<String, String>();
List<String> inProgressVServerIds = new ArrayList<String>();
String currentVnfcVserverId = new String();
try {
aaiService.getGenericVnfInfo(params, ctx);
int vm_count = Integer.parseInt(ctx.getAttribute("vm-count"));
- for(Request inprogressRequest:inProgressRequests){
+ for(Request inprogressRequest:inProgressRequests){
if(inprogressRequest.getActionIdentifiers().getVnfcName() != null){
- for (int i = 0; i < vm_count; i++){
+ for (int i = 0; i < vm_count; i++) {
if (ctx.getAttribute("vm[" + i + "].vnfc-name") != null && ctx.getAttribute("vm[" + i + "].vnfc-name")
.equals(inprogressRequest.getActionIdentifiers().getVnfcName()))
inProgressVServerIds.add(ctx.getAttribute("vm[" + i + "].vserver-id"));
- log.debug("Received vserver-id from AAI: "+ inProgressVServerIds);
+ log.debug("Received vserver-id from AAI: " + inProgressVServerIds);
}
}
}
for(Request inProgVserverIds:inProgressRequests)
- if(inProgVserverIds.getActionIdentifiers().getvServerId()!=null)
+ if(inProgVserverIds.getActionIdentifiers().getvServerId() != null)
inProgressVServerIds.add(inProgVserverIds.getActionIdentifiers().getvServerId());
if(currentRequestVnfcName != null){
for (int i = 0; i < vm_count; i++)
if (ctx.getAttribute("vm[" + i + "].vnfc-name") != null && ctx.getAttribute("vm[" + i + "].vnfc-name")
.equals(currentRequestVnfcName))
currentVnfcVserverId = ctx.getAttribute("vm[" + i + "].vserver-id");
- log.debug("Received vserver-id from AAI: "+ currentVnfcVserverId);
+ log.debug("Received vserver-id from AAI: " + currentVnfcVserverId);
return inProgressVServerIds.contains(currentVnfcVserverId);
}
for (Request request : inProgressRequests) {
private boolean isVserverOrVnfcIdOverLap(ScopeOverlap scopeOverlap) throws Exception {
List<Request> inProgressRequests = scopeOverlap.getInProgressRequest();
for (Request request : inProgressRequests) {
- if(request.getActionIdentifiers().getVnfId()!= null)
+ if(request.getActionIdentifiers().getVnfId() != null)
return Boolean.TRUE ;
}
for (Request request : inProgressRequests) {
- if(request.getActionIdentifiers().getVfModuleId()!= null)
+ if(request.getActionIdentifiers().getVfModuleId() != null)
return Boolean.TRUE ;
}
String currentVserverID = scopeOverlap.getCurrentRequest().getActionIdentifiers().getvServerId();
private boolean isVnfIdOverlap(ScopeOverlap scopeOverlap) throws Exception {
List<Request> inProgressRequests = scopeOverlap.getInProgressRequest();
- log.info("inProgressRequests list"+inProgressRequests.toString());
+ log.info("inProgressRequests list" + inProgressRequests.toString());
for (Request request : inProgressRequests) {
- log.info("request list"+request.getTargetId());
+ log.info("request list" + request.getTargetId());
if (!Strings.isNullOrEmpty(scopeOverlap.getVnfId())
&& !Strings.isNullOrEmpty(request.getTargetId())
&& (request.getTargetId()
}
return Boolean.FALSE;
}
+
+ protected ObjectMapper getObjectMapper() {
+ return new ObjectMapper();
+ }
+
+ protected AaiService getAaiService(AAIClient aaiClient) {
+ return new AaiService(aaiClient);
+ }
+
+ protected SvcLogicContext getSvcLogicContext() {
+ return new SvcLogicContext();
+ }
}
* ONAP : APPC
* ================================================================================
* Copyright (C) 2018 IBM
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.appc.interfaceService.serviceExecutor;
-import static org.junit.Assert.*;
-
import org.junit.Test;
import org.onap.appc.interfaces.service.executor.RequestValidator;
* Copyright (C) 2017 Amdocs
* ================================================================================
* Modification Copyright (C) 2018 IBM
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.appc.interfaceService.serviceExecutor;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
-
import org.onap.appc.interfaces.service.executorImpl.ServiceExecutorImpl;
import org.onap.appc.interfaces.service.data.ScopeOverlap;
import org.onap.appc.interfaces.service.executor.ServiceExecutor;
@Test(expected = Exception.class)
public void serviceExecutorException() throws Exception {
ServiceExecutor sei = new ServiceExecutor();
- String action ="";
+ String action = "";
String requestDataType = "";
String requestData = "{\"vnf-id\":\"ibcx8888v\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id\",\"vnf-id\" : \"vnf-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :[{\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id1\",\"vnf-id\" : \"vnf-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnf-id\" : \"vnf-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\": \"vserver-id2\"}}]}";
sei.execute(action, requestData, requestDataType);
@Test
public void serviceExecutorRequest() throws Exception {
ServiceExecutor sei = new ServiceExecutor();
- String action ="isScopeOverlap";
+ String action = "isScopeOverlap";
String requestDataType = "";
String requestData = "{\"vnf-id\":\"ibcx8888v\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id\",\"vnf-id\" : \"vnf-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :[{\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id1\",\"vnf-id\" : \"vnf-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnf-id\" : \"vnf-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\": \"vserver-id2\"}}]}";
String actual ="\"requestOverlap\" : true";
String result = sei.execute(action, requestData, requestDataType);
- assertEquals(actual,result);
+ assertEquals(actual, result);
}
@Test
public void serviceExecutorRqsFal() throws Exception {
ServiceExecutor sei = new ServiceExecutor();
- String action ="isScopeOverlap";
+ String action = "isScopeOverlap";
String requestDataType = "";
String actual ="\"requestOverlap\" : false";
String requestData = "{\"vnf-id\":\"ibcx8888v\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id\",\"vnf-id\" : \"vnf-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id\"}}}";
String result = sei.execute(action, requestData, requestDataType);
- assertEquals(actual,result);
+ assertEquals(actual, result);
}
@Test(expected = Exception.class)
public void serviceExecutorRqstEx() throws Exception {
ServiceExecutor sei = new ServiceExecutor();
- String action ="isScopeOverlap";
+ String action = "isScopeOverlap";
String requestData = "";
String requestDataType = "{\"vnf-id\":\"ibcx8888v\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id\"}},\"in-progress-requests\" :[{\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id1\",\"vnf-id\" : \"vnf-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" : \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnf-id\" : \"vnf-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\": \"vserver-id2\"},\"target-id\":\"ibcx0001v\"}]}";
sei.execute(action, requestData, requestDataType);
ScopeOverlap scopeOverlap = new ScopeOverlap();
ObjectMapper mapper = new ObjectMapper();
scopeOverlap = mapper.readValue(requestData, ScopeOverlap.class);
- boolean result = Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap",scopeOverlap);
+ boolean result = Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap", scopeOverlap);
assertEquals(true, result);
}
ScopeOverlap scopeOverlap = new ScopeOverlap();
ObjectMapper mapper = new ObjectMapper();
scopeOverlap = mapper.readValue(requestData, ScopeOverlap.class);
- boolean result = Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap",scopeOverlap);
+ boolean result = Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap", scopeOverlap);
assertEquals(true, result);
}
ScopeOverlap scopeOverlap = new ScopeOverlap();
ObjectMapper mapper = new ObjectMapper();
scopeOverlap = mapper.readValue(requestData, ScopeOverlap.class);
- Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap",scopeOverlap);
+ Whitebox.invokeMethod(sei, "isVserverOrVnfcIdOverLap", scopeOverlap);
}
}
* ONAP : APPC
* ================================================================================
* Copyright 2018 TechMahindra
+* ================================================================================
+* Modifications Copyright (C) 2019 Ericsson
*=================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class ExecutorExceptionTest {
+
@Test
- public void testConstructorWithMessaqge() throws Exception {
+ public void testConstructorWithMessage() throws Exception {
String message = "testing message";
ExecutorException executorException = new ExecutorException(message);
Assert.assertTrue(executorException.getCause() == null);
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2019 Ericsson
+ * ================================================================================
+ * 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.interfaces.service.executorImpl;
+
+import static org.junit.Assert.assertEquals;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.onap.appc.aai.client.aai.AaiService;
+import org.onap.appc.interfaces.service.data.Request;
+import org.onap.appc.interfaces.service.data.ScopeOverlap;
+import org.onap.ccsdk.sli.adaptors.aai.AAIClient;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ServiceExecutorImplTest {
+
+ private ServiceExecutorImpl executor;
+
+ @Rule
+ public ExpectedException expectedEx = ExpectedException.none();
+
+ @Test
+ public void testScopeOverlapEmpty() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ ScopeOverlap scopeOverlap = Mockito.spy(new ScopeOverlap());
+ List<Request> emptyList = new ArrayList<Request>();
+ Mockito.doReturn(emptyList).when(scopeOverlap).getInProgressRequest();
+ ObjectMapper objectMapper = Mockito.spy(new ObjectMapper());
+ Mockito.doReturn(objectMapper).when(executor).getObjectMapper();
+ Mockito.doReturn(scopeOverlap).when(objectMapper).readValue("{}", ScopeOverlap.class);
+ assertEquals("\"requestOverlap\" : false", executor.isRequestOverLap("{}"));
+ }
+
+ @Test
+ public void testScopeOverlapWithVnfIdInCurrentRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vnf-id\" : \"vnf-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\","
+ + "\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :[{\"action\" : \"HealthCheck\",\"action-identifiers\" :"
+ + " {\"service-instance-id\" : \"service-instance-id1\",\"vnf-id\" : \"vnf-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" :"
+ + " \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id2\",\"vnf-id\" : \"vnf-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\":"
+ + " \"vserver-id2\"}}]}";
+ assertEquals("\"requestOverlap\" : true", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapWithoutVnfIdButWithVfModuleIdCurrentRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\","
+ + "\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :[{\"action\" : \"HealthCheck\",\"action-identifiers\" :"
+ + " {\"service-instance-id\" : \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" :"
+ + " \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\":"
+ + " \"vserver-id2\"}}]}";
+ assertEquals("\"requestOverlap\" : true", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapWithVnfIdAndInProgressRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"vnf-id\":\"vnf-id1\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vnfc-name\" : \"vnfc-name\",\"vf-module-id\" : \"vf-module-id\","
+ + "\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" : [{\"target-id\": \"vnf-id1\",\"action\" : \"HealthCheck\",\"action-identifiers\" :"
+ + " {\"service-instance-id\" : \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vf-module-id\" :"
+ + " \"vf-module-id\",\"vserver-id\": \"vserver-id1\"}},{\"action\" : \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id2\",\"vnfc-name\" : \"vnfc-name2\",\"vf-module-id\" : \"vf-module-id2\",\"vserver-id\":"
+ + " \"vserver-id2\"}}]}";
+ assertEquals("\"requestOverlap\" : true", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapWithVserverIdAndInProgressRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"vnf-id\":\"\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vnfc-name\" : \"vnfc-name\",\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :"
+ + " [{\"target-id\": \"vnf-id1\",\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vserver-id\": \"vserver-id1\"}},{\"action\" :"
+ + " \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnfc-name\" :"
+ + " \"vnfc-name2\",\"vserver-id\": \"vserver-id2\"}}]}";
+ AaiService aaiServiceMock = Mockito.mock(AaiService.class);
+ Mockito.doReturn(aaiServiceMock).when(executor).getAaiService(Mockito.any(AAIClient.class));
+ SvcLogicContext ctx = new SvcLogicContext();
+ ctx.setAttribute("vm-count", "1");
+ Mockito.doReturn(ctx).when(executor).getSvcLogicContext();
+ assertEquals("\"requestOverlap\" : false", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapWithNoVnfcNameInCurrentRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"vnf-id\":\"\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vserver-id\": \"vserver-id\"}},\"in-progress-requests\" :"
+ + " [{\"target-id\": \"vnf-id1\",\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vserver-id\": \"vserver-id1\"}},{\"action\" :"
+ + " \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnfc-name\" :"
+ + " \"vnfc-name2\",\"vserver-id\": \"vserver-id2\"}}]}";
+ AaiService aaiServiceMock = Mockito.mock(AaiService.class);
+ Mockito.doReturn(aaiServiceMock).when(executor).getAaiService(Mockito.any(AAIClient.class));
+ SvcLogicContext ctx = new SvcLogicContext();
+ ctx.setAttribute("vm-count", "1");
+ Mockito.doReturn(ctx).when(executor).getSvcLogicContext();
+ assertEquals("\"requestOverlap\" : false", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapWithVnfcNameAndInProgressRequest() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"vnf-id\":\"\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\",\"vnfc-name\" : \"vnfc-name\"}},\"in-progress-requests\" :"
+ + " [{\"target-id\": \"vnf-id1\",\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vserver-id\": \"vserver-id1\"}},{\"action\" :"
+ + " \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnfc-name\" :"
+ + " \"vnfc-name2\",\"vserver-id\": \"vserver-id2\"}}]}";
+ AaiService aaiServiceMock = Mockito.mock(AaiService.class);
+ Mockito.doReturn(aaiServiceMock).when(executor).getAaiService(Mockito.any(AAIClient.class));
+ SvcLogicContext ctx = new SvcLogicContext();
+ ctx.setAttribute("vm-count", "1");
+ Mockito.doReturn(ctx).when(executor).getSvcLogicContext();
+ assertEquals("\"requestOverlap\" : false", executor.isRequestOverLap(requestData));
+ }
+
+ @Test
+ public void testScopeOverlapExceptionFlow() throws Exception {
+ executor = Mockito.spy(new ServiceExecutorImpl());
+ String requestData = "{\"vnf-id\":\"\",\"current-request\" :{\"action\" : \"Audit\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id\"}},\"in-progress-requests\" :"
+ + " [{\"target-id\": \"vnf-id1\",\"action\" : \"HealthCheck\",\"action-identifiers\" : {\"service-instance-id\" :"
+ + " \"service-instance-id1\",\"vnfc-name\" : \"vnfc-name1\",\"vserver-id\": \"vserver-id1\"}},{\"action\" :"
+ + " \"CheckLock\",\"action-identifiers\" : {\"service-instance-id\" : \"service-instance-id2\",\"vnfc-name\" :"
+ + " \"vnfc-name2\",\"vserver-id\": \"vserver-id2\"}}]}";
+ AaiService aaiServiceMock = Mockito.mock(AaiService.class);
+ Mockito.doReturn(aaiServiceMock).when(executor).getAaiService(Mockito.any(AAIClient.class));
+ SvcLogicContext ctx = new SvcLogicContext();
+ ctx.setAttribute("vm-count", "1");
+ Mockito.doReturn(ctx).when(executor).getSvcLogicContext();
+ expectedEx.expect(Exception.class);
+ expectedEx.expectMessage(" Action Identifier doesn't have VnfId, VfModuleId, VServerId, VnfcName ");
+ executor.isRequestOverLap(requestData);
+ }
+}
* ONAP : APPC
* ================================================================================
* Copyright 2018 TechMahindra
+* ================================================================================
+* Modifications Copyright (C) 2019 Ericsson
*=================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class ServiceConstantsTest {
- private ServiceConstants serviceConstants=new ServiceConstants();
@Test
public void testServiceConstants() {
- Assert.assertEquals("action-identifiers",serviceConstants.ACTIONIDENTIFIER);
- Assert.assertNotNull(serviceConstants.ACTIONIDENTIFIER);
-
+ Assert.assertEquals("action-identifiers", ServiceConstants.ACTIONIDENTIFIER);
}
}
Code Review / appc.git / commitdiff