/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* 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.aaisimulator.controller;
-import static org.onap.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.aaisimulator.utils.Constants.CUSTOMER_TYPE;
import static org.onap.aaisimulator.utils.Constants.CUSTOMER_URL;
-import static org.onap.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
import static org.onap.aaisimulator.utils.Constants.SERVICE_RESOURCE_TYPE;
-import static org.onap.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION;
import static org.onap.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
import static org.onap.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
+
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.Customer;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.ServiceInstances;
-import org.onap.aai.domain.yang.ServiceSubscription;
-import org.onap.aaisimulator.models.NodeServiceInstance;
-import org.onap.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.aaisimulator.service.providers.NodesCacheServiceProvider;
+import org.onap.aaisimulator.service.providers.ServiceInstanceCacheProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
@Controller
@RequestMapping(path = CUSTOMER_URL)
public class BusinessController {
private static final Logger LOGGER = LoggerFactory.getLogger(BusinessController.class);
- private final CustomerCacheServiceProvider cacheServiceProvider;
- private final NodesCacheServiceProvider nodesCacheServiceProvider;
- private final GenericVnfCacheServiceProvider genericVnfCacheServiceProvider;
-
- @Autowired
- public BusinessController(final CustomerCacheServiceProvider cacheServiceProvider,
- final NodesCacheServiceProvider nodesCacheServiceProvider,
- final GenericVnfCacheServiceProvider genericVnfCacheServiceProvider) {
- this.cacheServiceProvider = cacheServiceProvider;
- this.nodesCacheServiceProvider = nodesCacheServiceProvider;
- this.genericVnfCacheServiceProvider = genericVnfCacheServiceProvider;
- }
-
- @GetMapping(value = "{global-customer-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getCustomer(@PathVariable("global-customer-id") final String globalCustomerId,
- final HttpServletRequest request) {
- LOGGER.info("Will retrieve customer for 'global customer id': {} ...", globalCustomerId);
-
- final Optional<Customer> optional = cacheServiceProvider.getCustomer(globalCustomerId);
- if (optional.isPresent()) {
- final Customer customer = optional.get();
- LOGGER.info("found customer {} in cache", customer);
- return ResponseEntity.ok(customer);
- }
- LOGGER.error("Couldn't find {} in cache", globalCustomerId);
- return getRequestErrorResponseEntity(request, CUSTOMER_TYPE);
- }
-
- @PutMapping(value = "/{global-customer-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> putCustomer(@RequestBody final Customer customer,
- @PathVariable("global-customer-id") final String globalCustomerId, final HttpServletRequest request) {
- LOGGER.info("Will put customer for 'global customer id': {} ...", globalCustomerId);
-
- if (customer.getResourceVersion() == null || customer.getResourceVersion().isEmpty()) {
- customer.setResourceVersion(getResourceVersion());
-
- }
- cacheServiceProvider.putCustomer(globalCustomerId, customer);
- return ResponseEntity.accepted().build();
+ private final ServiceInstanceCacheProvider svcInstanceCacheSvcProvider;
+ @Autowired
+ public BusinessController(final ServiceInstanceCacheProvider serviceInstanceCacheProvider) {
+ this.svcInstanceCacheSvcProvider = serviceInstanceCacheProvider;
}
- @GetMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getCustomer(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType, final HttpServletRequest request) {
- LOGGER.info("Will retrieve service subscription for 'global customer id': {} and 'service type': {} ...",
- globalCustomerId, serviceType);
-
- final Optional<ServiceSubscription> optional =
- cacheServiceProvider.getServiceSubscription(globalCustomerId, serviceType);
- if (optional.isPresent()) {
- final ServiceSubscription serviceSubscription = optional.get();
- LOGGER.info("found service subscription {} in cache", serviceSubscription);
- return ResponseEntity.ok(serviceSubscription);
- }
-
- LOGGER.error("Couldn't find 'global customer id': {} and 'service type': {} in cache", globalCustomerId,
- serviceType);
- return getRequestErrorResponseEntity(request, SERVICE_SUBSCRIPTION);
- }
+ @PutMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
+ produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> putServiceInstance(@PathVariable("global-customer-id") final String globalCustomerId,
+ @PathVariable("service-type") final String serviceType,
+ @PathVariable(name = "service-instance-id") final String serviceInstanceId,
+ @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
- @PutMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> putServiceSubscription(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @RequestBody final ServiceSubscription serviceSubscription, final HttpServletRequest request) {
- LOGGER.info("Will add service subscription for 'global customer id': {} and 'service type': {} ...",
- globalCustomerId, serviceType);
+ LOGGER.info("Add service instance to cache for 'global customer id': {}, 'service type': {} and "
+ + "'service instance id: '{}..", globalCustomerId, serviceType, serviceInstanceId);
- if (cacheServiceProvider.putServiceSubscription(globalCustomerId, serviceType, serviceSubscription)) {
- LOGGER.info("Successfully add service subscription in cache ...");
+ if (svcInstanceCacheSvcProvider.putServiceInstance(globalCustomerId, serviceInstance)) {
+ LOGGER.info("Successfully added service instance to cache ...");
return ResponseEntity.accepted().build();
}
- LOGGER.error("Couldn't add service subscription using 'global customer id': {} and 'service type': {}",
- globalCustomerId, serviceType);
- return getRequestErrorResponseEntity(request, SERVICE_SUBSCRIPTION);
- }
-
- @GetMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getSericeInstances(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @RequestParam(name = "service-instance-name") final String serviceInstanceName,
- @RequestParam(name = "depth", required = false) final Integer depth, final HttpServletRequest request) {
-
- LOGGER.info(
- "Will retrieve service instances for 'global customer id': {}, 'service type': {} and 'service instance name: '{} with depth: {}...",
- globalCustomerId, serviceType, serviceInstanceName, depth);
-
- final Optional<ServiceInstances> optional =
- cacheServiceProvider.getServiceInstances(globalCustomerId, serviceType, serviceInstanceName);
- if (optional.isPresent()) {
- final ServiceInstances serviceInstances = optional.get();
- LOGGER.info("found service instance {} in cache", serviceInstances);
- return ResponseEntity.ok(serviceInstances);
- }
- LOGGER.error(
- "Couldn't find 'global customer id': {}, 'service type': {} and 'service instance name': {} with depth: {} in cache",
- globalCustomerId, serviceType, serviceInstanceName, depth);
- return getRequestErrorResponseEntity(request);
- }
-
- @GetMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestParam(name = "depth", required = false) final Integer depth,
- @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
- @RequestParam(name = "resultSize", required = false) final Integer resultSize,
- @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-
- LOGGER.info(
- "Will retrieve service instances for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with depth: {}, resultIndex:{}, resultSize: {} and format: {}...",
- globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
-
- final Optional<ServiceInstance> optional =
- cacheServiceProvider.getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
- if (optional.isPresent()) {
- final ServiceInstance serviceInstance = optional.get();
- LOGGER.info("found service instance {} in cache", serviceInstance);
- return ResponseEntity.ok(serviceInstance);
- }
LOGGER.error(
- "Couldn't find 'global customer id': {}, 'service type': {} and 'service instance id': {} with depth: {}, resultIndex:{}, resultSize: {} and format: {} in cache",
- globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
- return getRequestErrorResponseEntity(request);
+ "Couldn't add service instance for 'global customer id': {},'service type': {} and 'service instance id: '{} ...",
+ globalCustomerId, serviceType, serviceInstanceId);
+ return getRequestErrorResponseEntity(request, SERVICE_RESOURCE_TYPE);
}
- @PutMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> putSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String invocationId,
- @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
+ @GetMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
+ produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> getServiceInstance(@PathVariable("global-customer-id") final String globalCustomerId,
+ @PathVariable("service-type") final String serviceType,
+ @PathVariable(name = "service-instance-id") final String serviceInstanceId,
+ @RequestParam(name = "depth", required = false) final Integer depth,
+ @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
+ @RequestParam(name = "resultSize", required = false) final Integer resultSize,
+ @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
LOGGER.info(
- "Will add service instance for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
- globalCustomerId, serviceType, serviceInstanceId);
+ "Retrieve service instances for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with depth: {}, resultIndex:{}, resultSize: {} and format: {}...",
+ globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
- if (serviceInstance.getResourceVersion() == null || serviceInstance.getResourceVersion().isEmpty()) {
- serviceInstance.setResourceVersion(getResourceVersion());
- }
+ final Optional<ServiceInstance> svcInstance =
+ svcInstanceCacheSvcProvider.getServiceInstance(globalCustomerId);
- if (cacheServiceProvider.putServiceInstance(globalCustomerId, serviceType, serviceInstanceId,
- serviceInstance)) {
- nodesCacheServiceProvider.putNodeServiceInstance(serviceInstanceId, new NodeServiceInstance(
- globalCustomerId, serviceType, serviceInstanceId, SERVICE_RESOURCE_TYPE, request.getRequestURI()));
- return ResponseEntity.accepted().build();
+ if (svcInstance.isPresent()) {
+ final ServiceInstance serviceInstance = svcInstance.get();
+ LOGGER.info("Found service instance {} in cache", serviceInstance);
+ return ResponseEntity.ok(serviceInstance);
}
- LOGGER.error("Couldn't add 'global customer id': {}, 'service type': {} and 'service instance id': {} to cache",
- globalCustomerId, serviceType, serviceInstanceId);
+ LOGGER.error(
+ "Couldn't find 'global customer id': {}, 'service type': {} and 'service instance id': {} with depth: {}, resultIndex:{}, resultSize: {} and format: {} in cache",
+ globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
return getRequestErrorResponseEntity(request);
}
- @PostMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> patchSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
- @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
+ @PostMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
+ produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> patchServiceInstance(@PathVariable("global-customer-id") final String globalCustomerId,
+ @PathVariable("service-type") final String serviceType,
+ @PathVariable(name = "service-instance-id") final String serviceInstanceId,
+ @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
+ @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
LOGGER.info(
- "Will post service instance for 'global customer id': {}, 'service type': {}, 'service instance id: '{} and '{}': {}...",
- globalCustomerId, serviceType, serviceInstanceId, X_HTTP_METHOD_OVERRIDE, xHttpHeaderOverride);
+ "Post service instance for 'global customer id': {}, 'service type': {}, 'service instance id: '{} and '{}': {}...",
+ globalCustomerId, serviceType, serviceInstanceId, X_HTTP_METHOD_OVERRIDE, xHttpHeaderOverride);
if (HttpMethod.PATCH.toString().equalsIgnoreCase(xHttpHeaderOverride)) {
- cacheServiceProvider.patchServiceInstance(globalCustomerId, serviceType, serviceInstanceId,
- serviceInstance);
+ svcInstanceCacheSvcProvider.patchServiceInstance(globalCustomerId, serviceInstance);
return ResponseEntity.accepted().build();
}
LOGGER.error("{} not supported ... ", xHttpHeaderOverride);
return getRequestErrorResponseEntity(request);
}
-
-
- @GetMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/related-to/generic-vnfs",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getRelatedToGenericVnf(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestParam(name = "vnf-name", required = true) final String vnfName, final HttpServletRequest request) {
-
- LOGGER.info(
- "Will retrieve generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
- globalCustomerId, serviceType, serviceInstanceId, vnfName);
-
- final Optional<Relationship> optional =
- cacheServiceProvider.getRelationship(globalCustomerId, serviceType, serviceInstanceId, vnfName);
-
- if (optional.isPresent()) {
-
- final Relationship relationship = optional.get();
- final Optional<RelationshipData> relationshipDataOptional = relationship.getRelationshipData().stream()
- .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst();
-
- if (relationshipDataOptional.isPresent()) {
- final RelationshipData relationshipData = relationshipDataOptional.get();
- final String vnfId = relationshipData.getRelationshipValue();
- final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(vnfId);
- if (genericVnfOptional.isPresent()) {
- final GenericVnfs genericVnfs = new GenericVnfs();
- genericVnfs.getGenericVnf().add(genericVnfOptional.get());
- LOGGER.info("found service instance {} in cache", relationship);
- return ResponseEntity.ok(genericVnfs);
- }
- }
- }
- LOGGER.error(
- "Couldn't find generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
- globalCustomerId, serviceType, serviceInstanceId, vnfName);
- return getRequestErrorResponseEntity(request, GENERIC_VNF);
- }
-
- @PutMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}"
- + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
- consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> putSericeInstanceRelationShip(
- @PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestBody final Relationship relationship, final HttpServletRequest request) {
-
- LOGGER.info(
- "Will add {} relationship for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
- relationship.getRelatedTo(), globalCustomerId, serviceType, serviceInstanceId);
- final Optional<Relationship> optional = cacheServiceProvider.addRelationShip(globalCustomerId, serviceType,
- serviceInstanceId, relationship, request.getRequestURI());
-
- if (optional.isPresent()) {
- final Relationship resultantRelationship = optional.get();
- LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
- return ResponseEntity.accepted().body(resultantRelationship);
- }
-
- LOGGER.error(
- "Couldn't add {} relationship for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
- relationship.getRelatedTo(), globalCustomerId, serviceType, serviceInstanceId);
-
- return getRequestErrorResponseEntity(request);
- }
-
- @DeleteMapping(
- value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
- produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> deleteSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
- @PathVariable("service-type") final String serviceType,
- @PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestParam(name = "resource-version") final String resourceVersion, final HttpServletRequest request) {
-
- LOGGER.info(
- "Will delete SericeInstance for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
- globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
-
- if (cacheServiceProvider.deleteSericeInstance(globalCustomerId, serviceType, serviceInstanceId,
- resourceVersion)) {
- LOGGER.info(
- "Successfully deleted SericeInstance from cache for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
- globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
- return ResponseEntity.noContent().build();
- }
-
- LOGGER.error(
- "Unable to delete SericeInstance from cache for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
- globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
-
- return getRequestErrorResponseEntity(request);
-
- }
-}
+}
\ No newline at end of file
Code Review / integration / csit.git / blobdiff