diff options
| -rwxr-xr-x | cps-parent/pom.xml | 4 | ||||
| -rwxr-xr-x | cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java | 2 | ||||
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java | 5 | ||||
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/utils/YangUtils.java | 4 | ||||
| -rwxr-xr-x | docs/release-notes.rst | 37 |
5 files changed, 45 insertions, 7 deletions
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index b76cd2dbc9..06d6364b7d 100755 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -41,6 +41,7 @@ <java.version>11</java.version> <minimum-coverage>0.9</minimum-coverage> <nexusproxy>https://nexus.onap.org</nexusproxy> + <nexus.public.repo>nexus3.onap.org:10001/library/</nexus.public.repo> <oparent.version>3.1.0</oparent.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> @@ -324,6 +325,7 @@ see https://www.testcontainers.org/features/configuration/#disabling-ryuk --> <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED> + <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${nexus.public.repo}</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX> </environmentVariables> </configuration> </plugin> @@ -385,4 +387,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java index 8366f06b38..f466ebcef0 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java @@ -2,6 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2020 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 Pantheon.tech + * Modifications (C) 2021 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +57,6 @@ public class DataRestController implements CpsDataApi { public ResponseEntity<Object> getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName, final String xpath, final Boolean includeDescendants) { if ("/".equals(xpath)) { - // TODO: extracting data by anchor only (root data node and below) return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } final FetchDescendantsOption fetchDescendantsOption = Boolean.TRUE.equals(includeDescendants) diff --git a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java index 3ec4764bd6..3ee6afb719 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2021 Pantheon.tech + * Modifications (C) 2021 Nordix Foundation * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +33,6 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.onap.cps.spi.model.DataNode; -/* - TODO: this utility class belongs to REST, however it expected to be used by both CPS Core and xNF Proxy; - placed in cps-service until shared module is done for REST services, then to be moved there - */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class DataMapUtils { diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java index 6df973dc42..edef5cbca5 100644 --- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java +++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation + * Copyright (C) 2020-2021 Nordix Foundation * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 Pantheon.tech * ================================================================================ @@ -61,6 +61,7 @@ public class YangUtils { * @param schemaContext schema context describing associated data model * @return the NormalizedNode object */ + @SuppressWarnings("squid:S1452") // Generic type <? ,?> is returned by external librray, opendaylight.yangtools public static NormalizedNode<?, ?> parseJsonData(final String jsonData, final SchemaContext schemaContext) { return parseJsonData(jsonData, schemaContext, Optional.empty()); } @@ -73,6 +74,7 @@ public class YangUtils { * @param parentNodeXpath the xpath referencing the parent node current data fragment belong to * @return the NormalizedNode object */ + @SuppressWarnings("squid:S1452") // Generic type <? ,?> is returned by external librray, opendaylight.yangtools public static NormalizedNode<?, ?> parseJsonData(final String jsonData, final SchemaContext schemaContext, final String parentNodeXpath) { final DataSchemaNode parentSchemaNode = getDataSchemaNodeByXpath(parentNodeXpath, schemaContext); diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 971a60e4b4..468e21f39d 100755 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -20,6 +20,43 @@ CPS Release Notes .. * * * HONOULULU * * * .. ========================= +Version: 1.0.1 +============== + +Release Data +------------ + ++--------------------------------------+--------------------------------------------------------+ +| **CPS Project** | | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Docker images** | onap/cps-and-nf-proxy:1.0.1 | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release designation** | 1.0.1 Honolulu | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release date** | 2021-04-09 | +| | | ++--------------------------------------+--------------------------------------------------------+ + +Bug Fixes +--------- + + - `CPS-276 <https://jira.onap.org/browse/CPS-276>`_ Improve error reporting for invalid cpsPath on Queries + - `CPS-288 <https://jira.onap.org/browse/CPS-288>`_ Move security configuration to the application module + - `CPS-290 <https://jira.onap.org/browse/CPS-290>`_ Internal Server Error when creating the same data node twice + - `CPS-292 <https://jira.onap.org/browse/CPS-292>`_ Detailed information is missing to explain why data is not compliant with the specified YANG model + - `CPS-300 <https://jira.onap.org/browse/CPS-304>`_ Not able to create data instances for 2 different anchors using the same model + - `CPS-304 <https://jira.onap.org/browse/CPS-304>`_ Use ONAP recommended base Java Docker image + - `CPS-308 <https://jira.onap.org/browse/CPS-308>`_ Not able to upload yang models files greater than 1MB + +Security Notes +-------------- + +*Fixed Security Issues* + + - `CPS-249 <https://jira.onap.org/browse/CPS-249>`_ Exception stack trace is exposed Version: 1.0.0 ============== |