diff options
| -rw-r--r-- | bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java | 24 | ||||
| -rw-r--r-- | docs/api/apis/serviceInstances-api.rst | 108 | ||||
| -rw-r--r-- | releases/1.9.2.yaml | 22 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 153 insertions, 3 deletions
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java index 8d6e133a1c..24c9b0f85d 100644 --- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java +++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java @@ -28,7 +28,10 @@ import javax.annotation.PostConstruct; import org.camunda.bpm.application.PreUndeploy; import org.camunda.bpm.application.ProcessApplicationInfo; import org.camunda.bpm.engine.ProcessEngine; +import org.camunda.bpm.engine.RepositoryService; +import org.camunda.bpm.engine.repository.Deployment; import org.camunda.bpm.engine.repository.DeploymentBuilder; +import org.camunda.bpm.engine.repository.ProcessDefinition; import org.onap.logging.filter.spring.MDCTaskDecorator; import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator; import org.onap.so.db.catalog.beans.Workflow; @@ -76,6 +79,9 @@ public class MSOInfrastructureApplication { @Value("${mso.async.queue-capacity}") private int queueCapacity; + @Value("${mso.bpmn-history-ttl:14}") + private Integer bpmnHistoryTtl; + private static final String LOGS_DIR = "logs_dir"; private static final String BPMN_SUFFIX = ".bpmn"; private static final String SDC_SOURCE = "sdc"; @@ -102,8 +108,10 @@ public class MSOInfrastructureApplication { @PostConstruct public void postConstruct() { try { - DeploymentBuilder deploymentBuilder = processEngine.getRepositoryService().createDeployment(); + RepositoryService repositoryService = processEngine.getRepositoryService(); + DeploymentBuilder deploymentBuilder = repositoryService.createDeployment(); deployCustomWorkflows(deploymentBuilder); + setBpmnTTL(repositoryService, bpmnHistoryTtl); } catch (Exception e) { logger.warn("Unable to invoke deploymentBuilder ", e); } @@ -149,4 +157,18 @@ public class MSOInfrastructureApplication { logger.warn("Unable to deploy custom workflows ", e); } } + + private void setBpmnTTL(RepositoryService repositoryService, Integer ttl) { + List<Deployment> deployments = repositoryService.createDeploymentQuery().list(); + for (Deployment deployment : deployments) { + List<ProcessDefinition> processDefinitions = + repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list(); + for (ProcessDefinition processDefinition : processDefinitions) { + if (!ttl.equals(processDefinition.getHistoryTimeToLive())) { + logger.info("Setting ttl {} for processdefinition {}", ttl, processDefinition.getName()); + repositoryService.updateProcessDefinitionHistoryTimeToLive(processDefinition.getId(), ttl); + } + } + } + } } diff --git a/docs/api/apis/serviceInstances-api.rst b/docs/api/apis/serviceInstances-api.rst index 8eafe05a2e..15ed3932fd 100644 --- a/docs/api/apis/serviceInstances-api.rst +++ b/docs/api/apis/serviceInstances-api.rst @@ -13,6 +13,7 @@ This API allows to generate some requests to manage: - vfModules attached to a vnf instance (create, delete) - vnfs attached to a service instance (create, delete) - orchestrationRequests (get) +- CNF healthCheck links: @@ -26,7 +27,7 @@ links: - :ref:`delete_vnf` - :ref:`get_orchestration_request_by_id` - :ref:`get_orchestration_request_all` - +- :ref:`healthCheck` .. _create_service_instance: @@ -1293,3 +1294,108 @@ RequestStatus Object +-------------------------+------------------+-------------------------------------------------+ |percentProgress |String |percentage of progress | +-------------------------+------------------+-------------------------------------------------+ + +.. _healthCheck: + +CNF healthCheck +++++++++++++++++ + ++--------------------+---------------------------------------------------------------------------------------------------------------+ +|Interface Definition|Description | ++====================+===============================================================================================================+ +|URI |/onap/so/infra/serviceInstantiation/v7/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/healthcheck | ++--------------------+---------------------------------------------------------------------------------------------------------------+ +|Operation Type |POST | ++--------------------+---------------------------------------------------------------------------------------------------------------+ +|Content-Type |application/json | ++--------------------+---------------------------------------------------------------------------------------------------------------+ + +Request Headers: + ++-------------------+---------+-----------------------------------------------------------------------------------------+ +|Header Name |Required |Description | ++===================+=========+=========================================================================================+ +|Authorization |Y |Base64 encoded username:password | ++-------------------+---------+-----------------------------------------------------------------------------------------+ + +Request Body: + ++----------------+---------+-----------+--------------------------+-------------------------------------------+ +|Attribute |Qualifier|Cardinality|Content |Description | ++================+=========+===========+==========================+===========================================+ +|requestDetails |M |1 |requestDetails Object |Content of requestDetails object. | ++----------------+---------+-----------+--------------------------+-------------------------------------------+ + +RequestDetails Object + ++---------------------+-------------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=====================+=========================+=================================================+ +|modelInfo |modelInfo Object |Content of modelInfo object. | ++---------------------+-------------------------+-------------------------------------------------+ +|cloudConfiguration |cloudConfiguration Object|Content of cloudConfiguration object. | ++---------------------+-------------------------+-------------------------------------------------+ +|requestInfo |requestInfo Object |Content of requestInfo object. | ++---------------------+-------------------------+-------------------------------------------------+ +|relatedInstanceList |List |Content of relatedInstanceList. | ++---------------------+-------------------------+-------------------------------------------------+ + +ModelInfo Object + ++-------------------------+------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=========================+==================+=================================================+ +|ModelType |String |Type of model | ++-------------------------+------------------+-------------------------------------------------+ +|ModelInvariantId |String |The Model Invariant Id. | ++-------------------------+------------------+-------------------------------------------------+ +|ModelNameVersionId |String |The modelname Version Id | ++-------------------------+------------------+-------------------------------------------------+ +|ModelName |String |Name of the Model | ++-------------------------+------------------+-------------------------------------------------+ +|ModelVersion |String |Version of the model | ++-------------------------+------------------+-------------------------------------------------+ +|ModelCustomization Name |String |The Model Customization name | ++-------------------------+------------------+-------------------------------------------------+ + +CloudConfiguration Object + ++-------------------------+------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=========================+==================+=================================================+ +|lcpCloudRegionId |String |CloudRegion Id (in A&AI) | ++-------------------------+------------------+-------------------------------------------------+ +|tenantId |String |Name of the Subscriber | ++-------------------------+------------------+-------------------------------------------------+ + +RequestInfo Object + ++-------------------------+------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=========================+==================+=================================================+ +|InstanceName |String |The instance Name | ++-------------------------+------------------+-------------------------------------------------+ +|Source |String |source of the request | ++-------------------------+------------------+-------------------------------------------------+ +|SuppressRollback |Boolean |SuppressRollback | ++-------------------------+------------------+-------------------------------------------------+ + +relatedInstance List + ++-------------------------+------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=========================+==================+=================================================+ +|relatedInstance |Object |relatedInstance Object | ++-------------------------+------------------+-------------------------------------------------+ + +relatedInstance List + ++-------------------------+------------------+-------------------------------------------------+ +|Attribute |Content |Description | ++=========================+==================+=================================================+ +|instanceId |String |instanceId | ++-------------------------+------------------+-------------------------------------------------+ +|modelInfo |Object |Content of modelInfo object. | ++-------------------------+------------------+-------------------------------------------------+ +|instanceName |String |Name of the instance | ++-------------------------+------------------+-------------------------------------------------+
\ No newline at end of file diff --git a/releases/1.9.2.yaml b/releases/1.9.2.yaml new file mode 100644 index 0000000000..7c04ff1cfa --- /dev/null +++ b/releases/1.9.2.yaml @@ -0,0 +1,22 @@ + +--- +distribution_type: 'container' +container_release_tag: '1.9.2' +project: 'so' +log_dir: 'so-maven-docker-stage-master/880/' +ref: 'c0c57ed8c3ca558cb09e7885a9416accd2b80a67' +containers: + - name: 'so/catalog-db-adapter' + version: '1.9.2-20211012T0420' + - name: 'so/request-db-adapter' + version: '1.9.2-20211012T0420' + - name: 'so/openstack-adapter' + version: '1.9.2-20211012T0420' + - name: 'so/sdnc-adapter' + version: '1.9.2-20211012T0420' + - name: 'so/sdc-controller' + version: '1.9.2-20211012T0420' + - name: 'so/bpmn-infra' + version: '1.9.2-20211012T0420' + - name: 'so/api-handler-infra' + version: '1.9.2-20211012T0420' diff --git a/version.properties b/version.properties index ece298009d..ccc7b6172b 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=9 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} |