diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | releases/6.0.1.yaml | 5 | ||||
| -rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/utils/E2EServiceUtils.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java | 1 | ||||
| -rw-r--r-- | version.properties | 2 |
8 files changed, 16 insertions, 4 deletions
@@ -19,7 +19,7 @@ FROM registry.gitlab.com/onap-integration/docker/onap-java USER onap ARG SERVER_PORT -ARG PKG_FILENAME=nbi-rest-services-6.0.0-SNAPSHOT.jar +ARG PKG_FILENAME=nbi-rest-services-6.0.1-SNAPSHOT.jar ADD target/$PKG_FILENAME /opt/onap/app.jar RUN mkdir temptoscafile && chown onap:onap temptoscafile/ @@ -30,7 +30,7 @@ <groupId>org.onap.externalapi-nbi</groupId> <artifactId>nbi-rest-services</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>6.0.1-SNAPSHOT</version> <packaging>jar</packaging> <name>externalapi-nbi</name> diff --git a/releases/6.0.1.yaml b/releases/6.0.1.yaml new file mode 100644 index 0000000..cf4c9de --- /dev/null +++ b/releases/6.0.1.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '6.0.1' +project: 'externalapi-nbi' +log_dir: 'externalapi-nbi-maven-stage-master/313/' diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java index 2f0717d..e34beaa 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java @@ -31,6 +31,8 @@ import org.onap.nbi.commons.JsonRepresentation; import org.onap.nbi.commons.MultiCriteriaRequestBuilder; import org.onap.nbi.commons.ResourceManagement; import org.onap.nbi.exceptions.ValidationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Query; @@ -54,6 +56,8 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping(OnapComponentsUrlPaths.SERVICE_ORDER_PATH) public class ServiceOrderResource extends ResourceManagement { + private static final Logger LOGGER = LoggerFactory.getLogger(ServiceOrderResource.class); + @Autowired ServiceOrderService serviceOrderService; @@ -155,6 +159,7 @@ public class ServiceOrderResource extends ResourceManagement { } public ServiceOrder checkServiceOrder(ServiceOrder serviceOrder) { + LOGGER.debug("Checking Service order : {} ", serviceOrder.getId()); ServiceOrderInfo serviceOrderInfo = checkOrderConsistenceManager.checkServiceOrder(serviceOrder); if (serviceOrderInfo.isServiceOrderRejected()) { serviceOrderService.updateOrderState(serviceOrder, StateType.REJECTED); diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/utils/E2EServiceUtils.java b/src/main/java/org/onap/nbi/apis/serviceorder/utils/E2EServiceUtils.java index 086cd40..284bc91 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/utils/E2EServiceUtils.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/utils/E2EServiceUtils.java @@ -28,7 +28,7 @@ public class E2EServiceUtils { // and e2eServiceInstances )APIs for service CRUD // All E2E Services are required to be created in SDC under category "E2E Services" until SO fixes the // multiple API issue. - if (category.startsWith("e2e") || category.startsWith("CST")) { + if (category.startsWith("e2e") || category.startsWith("cst")) { e2eService = true; } } diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java index 9cadb1e..4ee4491 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java @@ -52,6 +52,7 @@ public class CreateAAIServiceTypeManager { String serviceTypeFromJson = serviceOrderItem.getService().getServicetype(); String serviceType = serviceTypeFromJson != null ? serviceTypeFromJson : (String) serviceOrderItemInfo.getCatalogResponse().get("name"); if (!serviceNameExistsInAAI(servicesInAaiForCustomer, serviceType)) { + LOGGER.debug("Creating AAI Service Type : {} ", serviceType); boolean serviceCreated = serviceOrderConsumerService.putServiceType( serviceOrderInfo.getSubscriberInfo().getGlobalSubscriberId(), serviceType, serviceOrder); if (!serviceCreated) { diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java index 8cabd97..ad4901c 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java @@ -50,6 +50,7 @@ public class SOTaskManager { Map<String, Long> internalIdOrderItemsMap = new HashMap<>();
if (orderItems != null) {
// first we save create all the execution tasks with order item id in relied tasks
+ LOGGER.debug("Creating {} relied tasks with order item id", orderItems.size());
for (ServiceOrderItem orderItem : orderItems) {
ExecutionTask task = new ExecutionTask();
task.setOrderItemId(orderItem.getId());
diff --git a/version.properties b/version.properties index 4823b07..f26e4fc 100644 --- a/version.properties +++ b/version.properties @@ -20,7 +20,7 @@ major = 6 minor = 0 -patch = 0 +patch = 1 base_version = ${major}.${minor}.${patch} |