"/onap/so/infra/serviceInstantiation/v7/serviceInstances/";
public static final String MSO_CREATE_E2ESERVICE_INSTANCE_PATH = "/onap/so/infra/e2eServiceInstances/v3";
public static final String MSO_DELETE_E2ESERVICE_INSTANCE_PATH = "/onap/so/infra/e2eServiceInstances/v3/";
+ public static final String MSO_ACTIVATION_E2ESERVICE_INSTANCE_PATH = "/onap/so/infra/e2eServiceInstances/v3/";
public static final String MSO_GET_E2EREQUEST_STATUS_PATH =
"/onap/so/infra/e2eServiceInstances/v3/$serviceId/operations/$operationId";
public static final String MSO_HEALTH_CHECK = "/globalhealthcheck";
import org.onap.nbi.apis.serviceorder.model.consumer.GetRequestStatusResponse;
import org.onap.nbi.apis.serviceorder.model.consumer.MSODeleteE2EPayload;
import org.onap.nbi.apis.serviceorder.model.consumer.MSOE2EPayload;
+import org.onap.nbi.apis.serviceorder.model.consumer.MSOE2EServiceActivationPayload;
+import org.onap.nbi.apis.serviceorder.model.consumer.MSOE2EServiceActivationReponse;
import org.onap.nbi.apis.serviceorder.model.consumer.MSOPayload;
import org.onap.nbi.apis.serviceorder.model.consumer.ServiceResponse;
import org.onap.nbi.exceptions.BackendFunctionalException;
private String getSoStatus;
private String getE2ESoStatus;
private String deleteE2ESoUrl;
+ private String activationE2ESoUrl;
private String deleteSoUrl;
private String SoHealthCheck;
.append(OnapComponentsUrlPaths.MSO_DELETE_REQUEST_STATUS_PATH).toString();
deleteE2ESoUrl = new StringBuilder().append(soHostname)
.append(OnapComponentsUrlPaths.MSO_DELETE_E2ESERVICE_INSTANCE_PATH).toString();
- getSoStatus = new StringBuilder().append(soHostname).append(OnapComponentsUrlPaths.MSO_GET_REQUEST_STATUS_PATH)
+ activationE2ESoUrl = new StringBuilder().append(soHostname)
+ .append(OnapComponentsUrlPaths.MSO_ACTIVATION_E2ESERVICE_INSTANCE_PATH).toString();
+ getSoStatus = new StringBuilder().append(soHostname).append(OnapComponentsUrlPaths.MSO_GET_REQUEST_STATUS_PATH)
.toString();
getE2ESoStatus = new StringBuilder().append(soHostname)
.append(OnapComponentsUrlPaths.MSO_GET_E2EREQUEST_STATUS_PATH).toString();
LOGGER.info("SO create e2e service url : " + createE2ESoUrl);
LOGGER.info("SO delete service url : " + deleteSoUrl);
LOGGER.info("SO delete e2e service url : " + deleteE2ESoUrl);
- LOGGER.info("SO get so status url : " + getSoStatus);
+ LOGGER.info("SO e2e service actiavtion url : " + activationE2ESoUrl);
+ LOGGER.info("SO get so status url : " + getSoStatus);
LOGGER.info("SO get e2e so status url : " + getE2ESoStatus);
LOGGER.info("SO healthCheck : " + SoHealthCheck);
HttpMethod.DELETE, new HttpEntity<>(msoDeleteE2EPayload, buildRequestHeader()),
DeleteE2EServiceInstanceResponse.class);
- // For E2E Services , Create and Delete Service responses are different, to maintain
- // consistentcy with ServiceInstances
- // Copy contents of DeleteE2EServiceInstanceResponse to CreateE2EServiceInstanceResponse
- CreateE2EServiceInstanceResponse dummyresponse = new CreateE2EServiceInstanceResponse();
- ServiceResponse serviceResponse = new ServiceResponse();
- dummyresponse.setService(serviceResponse);
- dummyresponse.getService().setOperationId(deleteresponse.getBody().getOperationId());
- dummyresponse.getService().setServiceId(serviceInstanceId);
-
+ CreateE2EServiceInstanceResponse dummyresponse = buildDummyResponse(serviceInstanceId,
+ deleteresponse.getBody().getOperationId());
ResponseEntity<CreateE2EServiceInstanceResponse> response =
new ResponseEntity(dummyresponse, deleteresponse.getStatusCode());
logE2EResponsePost(url, response);
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
}
}
+ public ResponseEntity<CreateE2EServiceInstanceResponse> callServiceActivationE2EService(String globalSubscriberId,
+ String serviceType, String serviceInstanceId, String operation) {
+ String url = new StringBuilder(activationE2ESoUrl).append(serviceInstanceId).append("/").append(operation).toString();
+ MSOE2EServiceActivationPayload msoE2EServiceActivationPayload = new MSOE2EServiceActivationPayload();
+ msoE2EServiceActivationPayload.setGlobalSubscriberId(globalSubscriberId);
+ msoE2EServiceActivationPayload.setServiceType(serviceType);
+
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Calling SO E2E Service Activation/Deactivation with url : " + url + " MSOE2EServiceActivationPayload : "
+ + msoE2EServiceActivationPayload.toString());
+ }
+
+ try {
+ ResponseEntity<MSOE2EServiceActivationReponse> activationResponse = restTemplate.exchange(url,
+ HttpMethod.POST, new HttpEntity<>(msoE2EServiceActivationPayload, buildRequestHeader()),
+ MSOE2EServiceActivationReponse.class);
+ CreateE2EServiceInstanceResponse dummyresponse = buildDummyResponse(serviceInstanceId,
+ activationResponse.getBody().getOperationId());
+
+ ResponseEntity<CreateE2EServiceInstanceResponse> response =
+ new ResponseEntity(dummyresponse, activationResponse.getStatusCode());
+ logE2EResponsePost(url, response);
+ return response;
+
+ } catch (BackendFunctionalException e) {
+ LOGGER.error(ERROR_ON_CALLING + url + " ," + e);
+ return new ResponseEntity<>(e.getHttpStatus());
+ } catch (ResourceAccessException e) {
+ LOGGER.error(ERROR_ON_CALLING + url + " ," + e);
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * @param serviceInstanceId
+ * @param operationId
+ * @return
+ * For E2E Services , Create and Delete/Activate/Deactivate Service responses are different,
+ * to maintain consistentcy with ServiceInstances Copy contents of ServiceActivationE2EReponse
+ * to CreateE2EServiceInstanceResponse
+ */
+ private CreateE2EServiceInstanceResponse buildDummyResponse(String serviceInstanceId,
+ String operationId) {
+ CreateE2EServiceInstanceResponse dummyresponse = new CreateE2EServiceInstanceResponse();
+ ServiceResponse serviceResponse = new ServiceResponse();
+ dummyresponse.setService(serviceResponse);
+ dummyresponse.getService().setOperationId(operationId);
+ dummyresponse.getService().setServiceId(serviceInstanceId);
+ return dummyresponse;
+ }
private void logResponsePost(String url, ResponseEntity<CreateServiceInstanceResponse> response) {
LOGGER.info(RESPONSE_STATUS + response.getStatusCodeValue());
if (LOGGER.isDebugEnabled()) {
return httpHeaders;
}
-}
\ No newline at end of file
+}
private String name = null;
@JsonProperty("serviceState")
- private String serviceState = null;
+ private ServiceStateType serviceState = null;
@JsonProperty("@type")
private String type = null;
this.name = name;
}
- public Service serviceState(String serviceState) {
+ public Service serviceState(ServiceStateType serviceState) {
this.serviceState = serviceState;
return this;
}
**/
@JsonProperty("serviceState")
@ApiModelProperty(value = "The lifecycle state of the service")
- public String getServiceState() {
+ public ServiceStateType getServiceState() {
return serviceState;
}
- public void setServiceState(String serviceState) {
+ public void setServiceState(ServiceStateType serviceState) {
this.serviceState = serviceState;
}
--- /dev/null
+/**
+ * Copyright (c) 2020 Wipro Limited
+ *
+ * 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.
+ */
+
+package org.onap.nbi.apis.serviceorder.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum ServiceStateType {
+
+ ACTIVE("active"),
+
+ INACTIVE("inactive");
+
+ private String value;
+
+ ServiceStateType(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return String.valueOf(value);
+ }
+
+ @JsonCreator
+ public static ServiceStateType fromValue(String text) {
+ for (ServiceStateType b : ServiceStateType.values()) {
+ if (String.valueOf(b.value).equals(text)) {
+ return b;
+ }
+ }
+ return null;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+}
+
--- /dev/null
+/**
+ * Copyright (c) 2020 Wipro Limited
+ *
+ * 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.
+ */
+
+package org.onap.nbi.apis.serviceorder.model.consumer;
+
+public class MSOE2EServiceActivationPayload {
+
+ private String globalSubscriberId;
+
+ private String serviceType;
+
+ public String getGlobalSubscriberId() {
+ return globalSubscriberId;
+ }
+
+ public void setGlobalSubscriberId(String globalSubscriberId) {
+ this.globalSubscriberId = globalSubscriberId;
+ }
+
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ public void setServiceType(String serviceType) {
+ this.serviceType = serviceType;
+ }
+
+ @Override
+ public String toString() {
+ return "MSOE2EServiceActivationPayload{" + "globalSubscriberId='" + globalSubscriberId + '\'' + ", serviceType='"
+ + serviceType + '\'' + '}';
+ }
+
+}
+
--- /dev/null
+/**
+ * Copyright (c) 2020 Wipro Limited
+ *
+ * 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.
+ */
+
+package org.onap.nbi.apis.serviceorder.model.consumer;
+
+public class MSOE2EServiceActivationReponse {
+
+ private String operationId;
+
+
+ public String getOperationId() {
+ return operationId;
+ }
+
+ public void setOperationId(String operationId) {
+ this.operationId = operationId;
+ }
+
+ @Override
+ public String toString() {
+ return "MSOE2EServiceActivationReponse{" + "operationId='" + operationId + '\'' + '}';
+ }
+}
+
import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
import org.onap.nbi.apis.serviceorder.model.StateType;
+import org.onap.nbi.apis.serviceorder.model.ServiceStateType;
import org.onap.nbi.apis.serviceorder.model.consumer.CloudConfiguration;
import org.onap.nbi.apis.serviceorder.model.consumer.CreateE2EServiceInstanceResponse;
import org.onap.nbi.apis.serviceorder.model.consumer.CreateMacroServiceInstanceResponse;
service.getServiceType(), serviceOrderItem.getService().getId());
break;
case MODIFY:
- if (StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState()) {
+ //EXT-API supports E2E service activation/deactivation with action=modify and seviceState=active/inactive
+ boolean isActivateReq = ServiceStateType.ACTIVE == serviceOrderItem.getService().getServiceState() ||
+ ServiceStateType.INACTIVE == serviceOrderItem.getService().getServiceState();
+
+ if (ServiceStateType.ACTIVE == serviceOrderItem.getService().getServiceState()) {
+ response = soClient.callServiceActivationE2EService(service.getGlobalSubscriberId(),
+ service.getServiceType(), serviceOrderItem.getService().getId(),"activate");
+ }
+ if (ServiceStateType.INACTIVE == serviceOrderItem.getService().getServiceState()) {
+ response = soClient.callServiceActivationE2EService(service.getGlobalSubscriberId(),
+ service.getServiceType(), serviceOrderItem.getService().getId(),"deactivate");
+ }
+ //Other E2E service modification follows Deletion followed by activation.
+ //For service modification, do not send serviceState=active/inactive
+ if (!isActivateReq && StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState()) {
response = soClient.callE2ECreateServiceInstance(msoE2EPayload);
}
- if (StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
+ if (!isActivateReq && StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
response = soClient.callE2EDeleteServiceInstance(service.getGlobalSubscriberId(),
service.getServiceType(), serviceOrderItem.getService().getId());
}
break;
- default:
+ default:
break;
}
return response;
}
-
+
private ResponseEntity<CreateMacroServiceInstanceResponse> postSOMacroRequest(ServiceOrderItem serviceOrderItem,
ServiceOrderInfo serviceOrderInfo) {
return userParams;
}
-}
\ No newline at end of file
+}
import org.onap.nbi.apis.serviceorder.model.ActionType;
import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
+import org.onap.nbi.apis.serviceorder.model.ServiceStateType;
import org.onap.nbi.apis.serviceorder.model.StateType;
import org.onap.nbi.apis.serviceorder.model.consumer.GetE2ERequestStatusResponse;
import org.onap.nbi.apis.serviceorder.model.consumer.GetRequestStatusResponse;
LOGGER.debug("orderitem id {} failed, response from request status {}", orderItem.getId(),
response.getRequest().getRequestStatus().getRequestState());
} else {
- updateOrderItemIfStatusCompleted(serviceOrder, orderItem);
+ boolean e2eService = false;
+ updateOrderItemIfStatusCompleted(serviceOrder, orderItem, e2eService);
LOGGER.debug("orderitem id {} completed");
}
} else {
}
- private void updateOrderItemIfStatusCompleted(ServiceOrder serviceOrder, ServiceOrderItem orderItem) {
+ private void updateOrderItemIfStatusCompleted(ServiceOrder serviceOrder, ServiceOrderItem orderItem,boolean e2eService) {
+ boolean serviceActivationReq = orderItem.getService().getServiceState() == ServiceStateType.ACTIVE ||
+ orderItem.getService().getServiceState() == ServiceStateType.INACTIVE;
if (orderItem.getAction() != ActionType.MODIFY) {
serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.COMPLETED);
- } else {
+ }else if(orderItem.getAction() == ActionType.MODIFY && serviceActivationReq && e2eService) {
+ serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.COMPLETED);
+ }else {
if (StateType.INPROGRESS_MODIFY_REQUEST_CREATE_SEND == orderItem.getState()) {
serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.COMPLETED);
} else {
LOGGER.debug("orderitem id {} failed, response from request status {}", orderItem.getId(),
response.getOperation().getResult());
} else if (FINISHED.equals(result)) {
- updateOrderItemIfStatusCompleted(serviceOrder, orderItem);
+ boolean e2eService = true;
+ updateOrderItemIfStatusCompleted(serviceOrder, orderItem,e2eService);
LOGGER.debug("orderitem id {} completed");
}
} else {
import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
import org.onap.nbi.apis.serviceorder.model.ServiceSpecificationRef;
import org.onap.nbi.apis.serviceorder.model.StateType;
+import org.onap.nbi.apis.serviceorder.model.ServiceStateType;
import org.onap.nbi.apis.serviceorder.model.Value;
import org.onap.nbi.apis.serviceorder.model.consumer.SubscriberInfo;
import org.onap.nbi.apis.serviceorder.model.orchestrator.ExecutionTask;
itemA.id("A");
itemA.action(ActionType.ADD);
Service serviceA = new Service();
- serviceA.setServiceState("active");
- ServiceSpecificationRef serviceSpecificationRefA = new ServiceSpecificationRef();
+ serviceA.setServiceState(ServiceStateType.ACTIVE);
+ ServiceSpecificationRef serviceSpecificationRefA = new ServiceSpecificationRef();
serviceSpecificationRefA.setId("333");
serviceA.setServiceSpecification(serviceSpecificationRefA);
itemA.setService(serviceA);
itemB.id("B");
itemB.action(ActionType.ADD);
Service serviceB = new Service();
- serviceB.setServiceState("active");
- ServiceSpecificationRef serviceSpecificationRefB = new ServiceSpecificationRef();
+ serviceB.setServiceState(ServiceStateType.ACTIVE);
+ ServiceSpecificationRef serviceSpecificationRefB = new ServiceSpecificationRef();
serviceSpecificationRefB.setId("1e3feeb0-8e36-46c6-862c-236d9c626439");
serviceB.setServiceSpecification(serviceSpecificationRefB);
itemB.setService(serviceB);
if (actionType != ActionType.ADD) {
serviceA.setId("e4688e5f-61a0-4f8b-ae02-a2fbde623bcb");
}
- serviceA.setServiceState("active");
- ServiceSpecificationRef serviceSpecificationRefA = new ServiceSpecificationRef();
+ serviceA.setServiceState(ServiceStateType.ACTIVE);
+ ServiceSpecificationRef serviceSpecificationRefA = new ServiceSpecificationRef();
serviceSpecificationRefA.setId("1e3feeb0-8e36-46c6-862c-236d9c626439");
serviceA.setServiceSpecification(serviceSpecificationRefA);
itemA.setService(serviceA);
if (actionType != ActionType.ADD) {
serviceB.setId("e4688e5f-61a0-4f8b-ae02-a2fbde623bcb");
}
- serviceB.setServiceState("active");
- ServiceSpecificationRef serviceSpecificationRefB = new ServiceSpecificationRef();
+ serviceB.setServiceState(ServiceStateType.ACTIVE);
+ ServiceSpecificationRef serviceSpecificationRefB = new ServiceSpecificationRef();
serviceSpecificationRefB.setId("1e3feeb0-8e36-46c6-862c-236d9c626439");
serviceB.setServiceSpecification(serviceSpecificationRefB);
itemB.setService(serviceB);
if (actionType != ActionType.ADD) {
serviceA.setId("e4688e5f-61a0-4f8b-ae02-a2fbde623bcb");
}
- serviceA.setServiceState("active");
+ serviceA.setServiceState(ServiceStateType.ACTIVE);
ServiceSpecificationRef serviceSpecificationRefA = new ServiceSpecificationRef();
serviceSpecificationRefA.setId("82c9fbb4-656c-4973-8c7f-172b22b5fa8f");
serviceA.setServiceSpecification(serviceSpecificationRefA);
if (actionType != ActionType.ADD) {
serviceB.setId("e4688e5f-61a0-4f8b-ae02-a2fbde623bcb");
}
- serviceB.setServiceState("active");
+ serviceB.setServiceState(ServiceStateType.ACTIVE);
ServiceSpecificationRef serviceSpecificationRefB = new ServiceSpecificationRef();
serviceSpecificationRefB.setId("82c9fbb4-656c-4973-8c7f-172b22b5fa8f");
serviceB.setServiceSpecification(serviceSpecificationRefB);
executionTaskRepository.save(executionTaskB);
return executionTaskA;
}
-}
\ No newline at end of file
+}
assertThat(executionTaskRepository.count()).isEqualTo(0);
}
+ @Test
+ public void testE2EExecutionTaskActivationSuccess() throws Exception {
+
+ ExecutionTask executionTaskA = ServiceOrderExecutionTaskAssertions
+ .setUpBddForE2EExecutionTaskSucess(serviceOrderRepository, executionTaskRepository, ActionType.MODIFY);
+ ExecutionTask executionTaskB;
+
+ SoTaskProcessor.processOrderItem(executionTaskA);
+ ServiceOrder serviceOrderChecked = getServiceOrder("test");
+ assertThat(serviceOrderChecked.getState()).isEqualTo(StateType.INPROGRESS);
+ for (ServiceOrderItem serviceOrderItem : serviceOrderChecked.getOrderItem()) {
+ if (serviceOrderItem.getId().equals("A")) {
+ assertThat(serviceOrderItem.getState()).isEqualTo(StateType.COMPLETED);
+ } else {
+ assertThat(serviceOrderItem.getState()).isEqualTo(StateType.ACKNOWLEDGED);
+ }
+ }
+
+ executionTaskB = getExecutionTask("B");
+ assertThat(executionTaskB.getReliedTasks()).isNullOrEmpty();
+ executionTaskA = getExecutionTask("A");
+ assertThat(executionTaskA).isNull();
+
+ SoTaskProcessor.processOrderItem(executionTaskB);
+ serviceOrderChecked = getServiceOrder("test");
+ assertThat(serviceOrderChecked.getState()).isEqualTo(StateType.COMPLETED);
+ for (ServiceOrderItem serviceOrderItem : serviceOrderChecked.getOrderItem()) {
+ assertThat(serviceOrderItem.getState()).isEqualTo(StateType.COMPLETED);
+
+ }
+
+ assertThat(executionTaskRepository.count()).isEqualTo(0);
+
+ }
+
@Test
public void testE2EExecutionTaskDeleteSuccess() throws Exception {
--- /dev/null
+{
+ "request": {
+ "method": "POST",
+ "url": "/onap/so/infra/e2eServiceInstances/v3/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb/activate"
+ },
+ "response": {
+ "status": 201,
+ "headers": {
+ "Content-Type": "application/json"
+ },
+ "jsonBody": {
+ "operationId": "operationId"
+ }
+ }
+}
+
Code Review / externalapi / nbi.git / commitdiff