import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@Autowired
private DmaapPropertiesClient dmaapPropertiesClient;
+
private final String file = "src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json";
private String requestId = "rq1234d1-5a33-55df-13ab-12abad84e331";
private String clientSource = "SPP";
package org.onap.so.client.dmaapproperties;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.so.BaseTest;
@Autowired
private GlobalDmaapPublisher globalDmaapPublisher;
-
+
+
@Test
public void testGetters() {
assertEquals("dmaapUsername", globalDmaapPublisher.getUserName());
package org.onap.so.client.exception;
import static org.junit.Assert.assertEquals;
-
+import static org.junit.Assert.assertTrue;
import org.camunda.bpm.engine.delegate.BpmnError;
import org.junit.Test;
import org.onap.so.bpmn.mock.FileUtil;
private static final String RESOURCE_PATH = "__files/";
private static final String VALID_ERROR_MESSAGE = "{test error message}";
+
@Test
public void buildAndThrowWorkflowExceptionTest() {
try {
SO Interfaces
================================
-.. image:: ../images/SO_1.png
+.. image:: ../../images/SO_1.png
SO APIs
----------------
|percentProgress |String |percentage of progress |
+-------------------------+------------------+-------------------------------------------------+
-SDC API
---------
+SDC Client API
+------------------
Get List of Existing Catalog Assets
+++++++++++++++++++++++++++++++++++
|Content-Disposition |M |Specifies the name of file to store the downloaded artifact’s payload ( RFC 2183) . |
+--------------------+---------+--------------------------------------------------------------------------------------------------------------------------+
-Upload Artifact
-+++++++++++++++
-
-+--------------------+-----------------------------------------------------------------------------------------------+
-|Interface Definition|Description |
-+====================+===============================================================================================+
-|URI |/sdc/v1/catalog/{assetType}/{uuid}/resourceInstances/{resourceInstanceNormalizedName}/artifacts|
-+--------------------+-----------------------------------------------------------------------------------------------+
-|Operation Type |POST |
-+--------------------+-----------------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================+
-|assetType |M |1 |String |The requested asset type.valid values are resources/services. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Uuid |M |1 |String |The uuid of the asset as published in the metadata |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|resourceInstanceNormalizedName|M |1 |String |Normalized name of resource |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-
-Request Body
-++++++++++++
-
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================+
-|payloadData |M |1 |String |The data of the artifact after Base64 encoding |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactLabel |M |1 |String |Identifier of the artifact within the VF / Service. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactName |M |1 |String |The name of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactType |M |1 |String |The type of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactGroupType |M |1 |String |Whether the artifact is informational or deployment. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|description |M |1 |String |Description of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-
-Request Headers:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Header Name |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|X-ECOMP-RequestID |N |request ID.If it is not sent it will be automatically generated by SDC on request receipt|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|X-ECOMP-InstanceID |Y |Instance ID |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Accept |N |Determines the format of the body of the response. Valid values are : “application/json”|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Authorization |Y |Base64 encoded username:password |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|USER_ID |Y |The user ID of the DCAE Designer. This user must also have Designer role in SDC |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Content-Type |Y |Valid value is : application/json |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Content-MD5 |Y |The value for this header must be the MD5 checksum over the whole json body |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Response:
-
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Content|Description |
-+====================+=========+=======+===================================================================================================+
-|artifactName |M |String |Artifact File name |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactType |M |String |Artifact Type |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactURL |M |String |Relative artifact’s URL. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactDescription |M |String |Artifact Description. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactTimeout |N |String |Will be populated only if its value is not 0. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactChecksum |Y |String |Base-64 encoded MD5 checksum of the artifact’s payload. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactUUID |Y |String |Global UUID generated by SDC each time when artifact payload is updated. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactVersion |Y |String |Service Version . |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|generatedFromUUID |N |String |This attribute will be sent only in the case of an artifact generated on basis of other artifact |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-
-Update Artifact
-+++++++++++++++
-
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Interface Definition|Description |
-+====================+==============================================================================================================+
-|URI |/sdc/v1/catalog/{assetType}/{uuid}/resourceInstances/{resourceInstanceNormalizedName}/artifacts/{artifactUUID}|
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Operation Type |POST |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================+
-|assetType |M |1 |String |The requested asset type.valid values are resources/services. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Uuid |M |1 |String |The uuid of the asset as published in the metadata |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactUUID |M |1 |String |The uuid of the artifact as published in the response of the upload/update operation |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|resourceInstanceNormalizedName|M |1 |String |Normalized name of resource |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-
-Request Headers:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Header Name |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|X-ECOMP-RequestID |N |request ID.If it is not sent it will be automatically generated by SDC on request receipt|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|X-ECOMP-InstanceID |Y |Instance ID |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Accept |N |Determines the format of the body of the response. Valid values are : “application/json”|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Authorization |Y |Base64 encoded username:password |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|USER_ID |Y |The user ID of the DCAE Designer. This user must also have Designer role in SDC |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Content-Type |Y |Valid value is : application/json |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Content-MD5 |Y |The value for this header must be the MD5 checksum over the whole json body |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Request Body:
-
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================+
-|payloadData |M |1 |String |The data of the artifact after Base64 encoding |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactLabel |M |1 |String |Identifier of the artifact within the VF / Service. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactName |M |1 |String |The name of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactType |M |1 |String |The type of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactGroupType |M |1 |String |Whether the artifact is informational or deployment. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|description |M |1 |String |Description of the artifact |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-
-Response:
-
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Content|Description |
-+====================+=========+=======+===================================================================================================+
-|artifactName |M |String |Artifact File name |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactType |M |String |Artifact Type |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactURL |M |String |Relative artifact’s URL. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactDescription |M |String |Artifact Description. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactTimeout |N |String |Will be populated only if its value is not 0. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactChecksum |Y |String |Base-64 encoded MD5 checksum of the artifact’s payload. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactUUID |Y |String |Global UUID generated by SDC each time when artifact payload is updated. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|artifactVersion |Y |String |Service Version . |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|generatedFromUUID |N |String |This attribute will be sent only in the case of an artifact generated on basis of other artifact |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-
-Delete Artifact
-+++++++++++++++
-
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Interface Definition|Description |
-+====================+==============================================================================================================+
-|URI |/sdc/v1/catalog/{assetType}/{uuid}/resourceInstances/{resourceInstanceNormalizedName}/artifacts/{artifactUUID}|
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Operation Type |DELETE |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================+
-|assetType |M |1 |String |The requested asset type.valid values are resources/services. |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|Uuid |M |1 |String |The uuid of the asset as published in the metadata |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|artifactUUID |M |1 |String |The uuid of the artifact as published in the response of the upload/update operation |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-|resourceInstanceNormalizedName|M |1 |String |Normalized name of resource |
-+------------------------------+---------+-----------+-------+-------------------------------------------------------------------------------------+
-
-Request Headers:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Header Name |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|X-ECOMP-RequestID |N |request ID.If it is not sent it will be automatically generated by SDC on request receipt|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|X-ECOMP-InstanceID |Y |Instance ID |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Accept |N |Determines the format of the body of the response. Valid values are : “application/json”|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Authorization |Y |Base64 encoded username:password |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|USER_ID |Y |The user ID of the DCAE Designer. This user must also have Designer role in SDC |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Response:
-
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Content|Description |
-+====================+=========+=======+===================================================================================================+
-|artifactUUID |Y |String |Global UUID generated by SDC each time when artifact payload is updated. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-
-Update Lifecycle
-++++++++++++++++
-
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Interface Definition|Description |
-+====================+==============================================================================================================+
-|URI |/sdc/v1/catalog/{assetType}/{uuid}/lifecycleState/{lifecycleOperation} |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Operation Type |POST |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+------------------------------+---------+-----------+-------+-----------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Cardinality|Content|Description |
-+==============================+=========+===========+=======+=====================================================================================================+
-|assetType |M |1 |String |The requested asset type.valid values are resources/services. |
-+------------------------------+---------+-----------+-------+-----------------------------------------------------------------------------------------------------+
-|Uuid |M |1 |String |The uuid of the asset as published in the metadata |
-+------------------------------+---------+-----------+-------+-----------------------------------------------------------------------------------------------------+
-|lifecycleOperation |M |1 |String |The lifecycle operation to be performed on the asset.Valid values are: Checkin / Checkout / Certify |
-+------------------------------+---------+-----------+-------+-----------------------------------------------------------------------------------------------------+
-
-Request Headers:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Header Name |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|X-ECOMP-RequestID |N |request ID.If it is not sent it will be automatically generated by SDC on request receipt|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|X-ECOMP-InstanceID |Y |Instance ID |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Accept |N |Determines the format of the body of the response. Valid values are : “application/json”|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Authorization |Y |Base64 encoded username:password |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|USER_ID |Y |The user ID of the DCAE Designer. This user must also have Designer role in SDC |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|userRemarks |N |Short description (free text) about the asset version being changed |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Response:
-
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Content|Description |
-+====================+=========+=======+===================================================================================================+
-|uuid |Y |String |UUID generated by SDC per each major version of the asset |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|invariantUUID |Y |String |UUID generated by SDC per each asset. This UUID stays constant for all the asset’s versions |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|name |Y |String |The name of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|version |Y |String |The asset version in SDC catalog |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|category |Y |String |Category of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|subcategory |Y |String |Sub-category of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|resourceType |Y |String |The type of resource. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|lifecycleState |Y |String |The lifecycle state of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|lastUpdaterUserId |Y |String |User ID of the SDC designer who was the last to update the asset for this major version. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-
-Create Resource
-+++++++++++++++
-
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Interface Definition|Description |
-+====================+==============================================================================================================+
-|URI |/sdc/v1/catalog/resources |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-|Operation Type |POST |
-+--------------------+--------------------------------------------------------------------------------------------------------------+
-
-Request Headers:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Header Name |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|X-ECOMP-RequestID |N |request ID.If it is not sent it will be automatically generated by SDC on request receipt|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|X-ECOMP-InstanceID |Y |Instance ID |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Accept |N |Determines the format of the body of the response. Valid values are : “application/json”|
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Authorization |Y |Base64 encoded username:password |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|USER_ID |Y |The user ID of the DCAE Designer. This user must also have Designer role in SDC |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Content-Type |Y |Valid value is : application/json |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Request Parameters:
-
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Description |
-+===================+=========+=========================================================================================+
-|name |Y |The name of the resource |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|description |Y |Short description of the resource |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|resourceType |Y |“VFCMT” / “VF” / “PNF” |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|category |Y |VFCMT category is “Template”. |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|subcategory |Y |VFCMT subcategory is “Monitoring Template”. |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|vendorName |Y |Vendor Name |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|vendorRelease |Y |Vendor Release |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|tags |Y |The tags are used for search options. |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|icon |Y |The icon should be pre-defined in SDC. |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-|contactId |Y |The user ID of user responsible for this VFCMT. |
-+-------------------+---------+-----------------------------------------------------------------------------------------+
-
-Response:
-
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|Attribute |Qualifier|Content|Description |
-+====================+=========+=======+===================================================================================================+
-|uuid |Y |String |UUID generated by SDC per each major version of the asset |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|invariantUUID |Y |String |UUID generated by SDC per each asset. This UUID stays constant for all the asset’s versions |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|name |Y |String |The name of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|version |Y |String |The asset version in SDC catalog |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|category |Y |String |Category of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|subcategory |Y |String |Sub-category of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|resourceType |Y |String |The type of resource. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|lifecycleState |Y |String |The lifecycle state of the asset. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-|lastUpdaterUserId |Y |String |User ID of the SDC designer who was the last to update the asset for this major version. |
-+--------------------+---------+-------+---------------------------------------------------------------------------------------------------+
-
-UUI API
+E2E Service API
----------------
+
Create E2E service instance
++++++++++++++++++++++++++++
"swagger json file", "yaml doc"
":download:`link <swagger/SO_MONITORING_SWAGGER.json>`", ":download:`link <swagger/SO_MONITORING_SWAGGER.yaml>`"
-
+
+Further Reading
+----------------------------------------
+
Detailed documentation can be found here:
- SO_Interface.rst
\ No newline at end of file
+
+.. toctree::
+ :maxdepth: 1
+
+ apis/SO_Interface.rst
\ No newline at end of file
.. toctree::
:maxdepth: 1
-
-.. developer_info_Project_Structure.rst
+
Camunda_Modeler.rst
-.. developer_info_Main_Process_Flows.rst
-.. developer_info_Subprocess_Process_Flows.rst
-.. developer_info_Project_Deployment_Strategy.rst
Building_SO.rst
Working_with_SO_Docker.rst
Camunda_Cockpit_Community_Edition.rst
Camunda_Cockpit_Enterprise_Edition.rst
-
\ No newline at end of file
+.. developer_info_Project_Structure.rst
+.. developer_info_Main_Process_Flows.rst
+.. developer_info_Subprocess_Process_Flows.rst
+.. developer_info_Project_Deployment_Strategy.rst
\ No newline at end of file
The SO provides the highest level of service orchestration in the ONAP architecture.
+Version: 1.3.6
+--------------
+
+:Release Date: 2018-01-10
+
+This is the official release package that released for the Casablanca Maintenance.
+
+Casablanca Release branch
+
+**New Features**
+
+This release is supporting the features of Casablanca and their defect fixes.
+- `SO-1336 <https://jira.onap.org/browse/SO-1336>`_
+- `SO-1249 <https://jira.onap.org/browse/SO-1249>`_
+- `SO-1257 <https://jira.onap.org/browse/SO-1257>`_
+- `SO-1258 <https://jira.onap.org/browse/SO-1258>`_
+- `SO-1256 <https://jira.onap.org/browse/SO-1256>`_
+- `SO-1194 <https://jira.onap.org/browse/SO-1256>`_
+- `SO-1248 <https://jira.onap.org/browse/SO-1248>`_
+- `SO-1184 <https://jira.onap.org/browse/SO-1184>`_
+
+**Docker Images**
+
+Dockers released for SO:
+
+ - onap/so/api-handler-infra,1.3.6
+ - onap/so/bpmn-infra,1.3.6
+ - onap/so/catalog-db-adapter,1.3.6
+ - onap/so/openstack-adapter,1.3.6
+ - onap/so/request-db-adapter,1.3.6
+ - onap/so/sdc-controller,1.3.6
+ - onap/so/sdnc-adapter,1.3.6
+ - onap/so/so-monitoring,1.3.6
+ - onap/so/vfc-adapter,1.3.6
+
+**Known Issues**
+
+
+**Security Notes**
+
+ SO code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The SO open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_.
+
+ Quick Links:
+
+ - `SO project page <https://wiki.onap.org/display/DW/Service+Orchestrator+Project>`_
+ - `Passing Badge information for SO <https://bestpractices.coreinfrastructure.org/en/projects/1702>`_
+ - `Project Vulnerability Review Table for SO <https://wiki.onap.org/pages/viewpage.action?pageId=43385708>`_
+
+
Version: 1.3.3
--------------
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.camunda.model;
+package org.onap.so.monitoring.camunda.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.camunda.model;
+package org.onap.so.monitoring.camunda.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.camunda.model;
+package org.onap.so.monitoring.camunda.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.camunda.model;
+package org.onap.so.monitoring.camunda.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
import com.fasterxml.jackson.annotation.JsonIgnore;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.camunda.model;
+package org.onap.so.monitoring.camunda.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.camunda;
+package org.onap.so.monitoring.configuration.camunda;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.camunda;
+package org.onap.so.monitoring.configuration.camunda;
import java.net.URI;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.database;
+package org.onap.so.monitoring.configuration.database;
import org.springframework.beans.factory.annotation.Value;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.database;
+package org.onap.so.monitoring.configuration.database;
import java.net.URI;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.rest;
+package org.onap.so.monitoring.configuration.rest;
import java.io.IOException;
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.monitoring.configuration.rest;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author waqas.ikram@ericsson, eoin.hanan@ericsson.com
+ */
+@Configuration
+public class CorsConfigurer {
+
+ @Bean
+ public CorsFilter corsFilter() {
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true);
+ config.addAllowedOrigin("*");
+ config.addAllowedHeader("*");
+ config.addAllowedMethod("*");
+ source.registerCorsConfiguration("/**", config);
+ return new CorsFilter(source);
+ }
+}
+
+
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.rest;
+package org.onap.so.monitoring.configuration.rest;
import java.util.concurrent.TimeUnit;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.rest;
+package org.onap.so.monitoring.configuration.rest;
-import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.CAMUNDA_REST_TEMPLATE;
-import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.DATABASE_REST_TEMPLATE;
+import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.CAMUNDA_REST_TEMPLATE;
+import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.DATABASE_REST_TEMPLATE;
-import org.onap.so.montoring.rest.service.HttpRestServiceProvider;
-import org.onap.so.montoring.rest.service.HttpRestServiceProviderImpl;
+import org.onap.so.monitoring.rest.service.HttpRestServiceProvider;
+import org.onap.so.monitoring.rest.service.HttpRestServiceProviderImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.rest;
+package org.onap.so.monitoring.configuration.rest;
import java.util.concurrent.TimeUnit;
* @author waqas.ikram@ericsson.com
*/
@Configuration
-public class RestTemplateConfigration {
+public class RestTemplateConfiguration {
public static final String DATABASE_REST_TEMPLATE = "databaseRestTemplate";
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.db.service;
+package org.onap.so.monitoring.db.service;
import java.util.List;
import java.util.Map;
-import org.onap.so.montoring.model.SoInfraRequest;
+import org.onap.so.monitoring.model.SoInfraRequest;
/**
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.db.service;
+package org.onap.so.monitoring.db.service;
-import static org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration.DATABASE_HTTP_REST_SERVICE_PROVIDER;
+import static org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration.DATABASE_HTTP_REST_SERVICE_PROVIDER;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.so.montoring.camunda.model.SoActiveInfraRequests;
-import org.onap.so.montoring.configuration.database.DatabaseUrlProvider;
-import org.onap.so.montoring.model.SoInfraRequest;
-import org.onap.so.montoring.model.SoInfraRequestBuilder;
-import org.onap.so.montoring.rest.service.HttpRestServiceProvider;
+import org.onap.so.monitoring.camunda.model.SoActiveInfraRequests;
+import org.onap.so.monitoring.configuration.database.DatabaseUrlProvider;
+import org.onap.so.monitoring.model.SoInfraRequest;
+import org.onap.so.monitoring.model.SoInfraRequestBuilder;
+import org.onap.so.monitoring.rest.service.HttpRestServiceProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.exception;
+package org.onap.so.monitoring.exception;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.exception;
+package org.onap.so.monitoring.exception;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
/**
* @author waqas.ikram@ericsson.com
*/
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
public class ProcessInstanceVariableDetail {
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
-import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual;
+import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.model;
+package org.onap.so.monitoring.model;
import java.sql.Timestamp;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.rest.service;
+package org.onap.so.monitoring.rest.service;
import java.util.List;
-import org.onap.so.montoring.model.ActivityInstanceDetail;
-import org.onap.so.montoring.model.ProcessDefinitionDetail;
-import org.onap.so.montoring.model.ProcessInstanceDetail;
-import org.onap.so.montoring.model.ProcessInstanceIdDetail;
-import org.onap.so.montoring.model.ProcessInstanceVariableDetail;
+import org.onap.so.monitoring.model.ActivityInstanceDetail;
+import org.onap.so.monitoring.model.ProcessDefinitionDetail;
+import org.onap.so.monitoring.model.ProcessInstanceDetail;
+import org.onap.so.monitoring.model.ProcessInstanceIdDetail;
+import org.onap.so.monitoring.model.ProcessInstanceVariableDetail;
import com.google.common.base.Optional;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.rest.service;
+package org.onap.so.monitoring.rest.service;
-import static org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration.CAMUNDA_HTTP_REST_SERVICE_PROVIDER;
+import static org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration.CAMUNDA_HTTP_REST_SERVICE_PROVIDER;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.onap.so.montoring.camunda.model.ActivityInstance;
-import org.onap.so.montoring.camunda.model.ProcessDefinition;
-import org.onap.so.montoring.camunda.model.ProcessInstance;
-import org.onap.so.montoring.camunda.model.ProcessInstanceVariable;
-import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider;
-import org.onap.so.montoring.model.ActivityInstanceDetail;
-import org.onap.so.montoring.model.ProcessDefinitionDetail;
-import org.onap.so.montoring.model.ProcessInstanceDetail;
-import org.onap.so.montoring.model.ProcessInstanceIdDetail;
-import org.onap.so.montoring.model.ProcessInstanceVariableDetail;
+import org.onap.so.monitoring.camunda.model.ActivityInstance;
+import org.onap.so.monitoring.camunda.model.ProcessDefinition;
+import org.onap.so.monitoring.camunda.model.ProcessInstance;
+import org.onap.so.monitoring.camunda.model.ProcessInstanceVariable;
+import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider;
+import org.onap.so.monitoring.model.ActivityInstanceDetail;
+import org.onap.so.monitoring.model.ProcessDefinitionDetail;
+import org.onap.so.monitoring.model.ProcessInstanceDetail;
+import org.onap.so.monitoring.model.ProcessInstanceIdDetail;
+import org.onap.so.monitoring.model.ProcessInstanceVariableDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.rest.service;
+package org.onap.so.monitoring.rest.service;
import com.google.common.base.Optional;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.rest.service;
+package org.onap.so.monitoring.rest.service;
-import org.onap.so.montoring.exception.InvalidRestRequestException;
-import org.onap.so.montoring.exception.RestProcessingException;
+import org.onap.so.monitoring.exception.InvalidRestRequestException;
+import org.onap.so.monitoring.exception.RestProcessingException;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.utils;
+package org.onap.so.monitoring.utils;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration;
+package org.onap.so.monitoring.configuration;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.onap.so.montoring.configuration.camunda.CamundaConfiguration;
-import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider;
+import org.onap.so.monitoring.configuration.camunda.CamundaConfiguration;
+import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider;
/**
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration;
+package org.onap.so.monitoring.configuration;
import static org.junit.Assert.assertEquals;
import java.util.UUID;
import org.junit.Test;
-import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider;
+import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider;
/**
* @author waqas.ikram@ericsson.com
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration;
+package org.onap.so.monitoring.configuration;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration;
-import org.onap.so.montoring.rest.service.HttpRestServiceProvider;
+import org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration;
+import org.onap.so.monitoring.rest.service.HttpRestServiceProvider;
import org.springframework.web.client.RestTemplate;
/**
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration;
+package org.onap.so.monitoring.configuration;
import static org.junit.Assert.assertFalse;
@Test
public void test_camunda_module_pojo_classes() throws ClassNotFoundException {
- test("org.onap.so.montoring.camunda.model");
- assertEqualMethod("org.onap.so.montoring.camunda.model");
+ test("org.onap.so.monitoring.camunda.model");
+ assertEqualMethod("org.onap.so.monitoring.camunda.model");
}
@Test
public void test_so_monitoring_pojo_classes() throws ClassNotFoundException {
- test("org.onap.so.montoring.model");
- assertEqualMethod("org.onap.so.montoring.model");
+ test("org.onap.so.monitoring.model");
+ assertEqualMethod("org.onap.so.monitoring.model");
}
public void assertEqualMethod(final String pojoPackage) throws ClassNotFoundException {
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.configuration.database;
+package org.onap.so.monitoring.configuration.database;
import static org.junit.Assert.assertEquals;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.db.api;
+package org.onap.so.monitoring.db.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.util.UUID;
import org.junit.Test;
-import org.onap.so.montoring.camunda.model.SoActiveInfraRequests;
-import org.onap.so.montoring.configuration.database.DatabaseUrlProvider;
-import org.onap.so.montoring.db.service.DatabaseServiceProvider;
-import org.onap.so.montoring.db.service.DatabaseServiceProviderImpl;
-import org.onap.so.montoring.model.SoInfraRequest;
-import org.onap.so.montoring.rest.service.HttpRestServiceProvider;
+import org.onap.so.monitoring.camunda.model.SoActiveInfraRequests;
+import org.onap.so.monitoring.configuration.database.DatabaseUrlProvider;
+import org.onap.so.monitoring.db.service.DatabaseServiceProvider;
+import org.onap.so.monitoring.db.service.DatabaseServiceProviderImpl;
+import org.onap.so.monitoring.model.SoInfraRequest;
+import org.onap.so.monitoring.rest.service.HttpRestServiceProvider;
import com.google.common.base.Optional;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.rest.service;
+package org.onap.so.monitoring.rest.service;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.util.UUID;
import org.junit.Test;
-import org.onap.so.montoring.camunda.model.ActivityInstance;
-import org.onap.so.montoring.camunda.model.ProcessDefinition;
-import org.onap.so.montoring.camunda.model.ProcessInstance;
-import org.onap.so.montoring.camunda.model.ProcessInstanceVariable;
-import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider;
-import org.onap.so.montoring.model.ActivityInstanceDetail;
-import org.onap.so.montoring.model.ProcessDefinitionDetail;
-import org.onap.so.montoring.model.ProcessInstanceIdDetail;
-import org.onap.so.montoring.model.ProcessInstanceVariableDetail;
+import org.onap.so.monitoring.camunda.model.ActivityInstance;
+import org.onap.so.monitoring.camunda.model.ProcessDefinition;
+import org.onap.so.monitoring.camunda.model.ProcessInstance;
+import org.onap.so.monitoring.camunda.model.ProcessInstanceVariable;
+import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider;
+import org.onap.so.monitoring.model.ActivityInstanceDetail;
+import org.onap.so.monitoring.model.ProcessDefinitionDetail;
+import org.onap.so.monitoring.model.ProcessInstanceIdDetail;
+import org.onap.so.monitoring.model.ProcessInstanceVariableDetail;
import com.google.common.base.Optional;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.montoring.utils;
+package org.onap.so.monitoring.utils;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.onap.so.montoring.db.service.DatabaseServiceProvider;
-import org.onap.so.montoring.exception.InvalidRestRequestException;
-import org.onap.so.montoring.exception.RestProcessingException;
-import org.onap.so.montoring.model.ActivityInstanceDetail;
-import org.onap.so.montoring.model.ProcessDefinitionDetail;
-import org.onap.so.montoring.model.ProcessInstanceDetail;
-import org.onap.so.montoring.model.ProcessInstanceIdDetail;
-import org.onap.so.montoring.model.ProcessInstanceVariableDetail;
-import org.onap.so.montoring.model.SoInfraRequest;
-import org.onap.so.montoring.rest.service.CamundaProcessDataServiceProvider;
+import org.onap.so.monitoring.db.service.DatabaseServiceProvider;
+import org.onap.so.monitoring.exception.InvalidRestRequestException;
+import org.onap.so.monitoring.exception.RestProcessingException;
+import org.onap.so.monitoring.model.ActivityInstanceDetail;
+import org.onap.so.monitoring.model.ProcessDefinitionDetail;
+import org.onap.so.monitoring.model.ProcessInstanceDetail;
+import org.onap.so.monitoring.model.ProcessInstanceIdDetail;
+import org.onap.so.monitoring.model.ProcessInstanceVariableDetail;
+import org.onap.so.monitoring.model.SoInfraRequest;
+import org.onap.so.monitoring.rest.service.CamundaProcessDataServiceProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.CAMUNDA_REST_TEMPLATE;
+import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.CAMUNDA_REST_TEMPLATE;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withBadRequest;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider;
-import org.onap.so.montoring.model.ActivityInstanceDetail;
-import org.onap.so.montoring.model.ProcessDefinitionDetail;
-import org.onap.so.montoring.model.ProcessInstanceDetail;
-import org.onap.so.montoring.model.ProcessInstanceIdDetail;
-import org.onap.so.montoring.model.ProcessInstanceVariableDetail;
+import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider;
+import org.onap.so.monitoring.model.ActivityInstanceDetail;
+import org.onap.so.monitoring.model.ProcessDefinitionDetail;
+import org.onap.so.monitoring.model.ProcessInstanceDetail;
+import org.onap.so.monitoring.model.ProcessInstanceIdDetail;
+import org.onap.so.monitoring.model.ProcessInstanceVariableDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
Code Review / so.git / commitdiff