Release notes and version update

- updated the latest cps released version i.e 3.5.5 in dmi-plugin POMs.
- Updated the release notes and syncd the openapi files

Issue-ID: CPS-2489
Change-Id: I1614a1d5fb903f1af19ca4cb6e8e372d0445bb6f
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/docs/api/swagger/openapi-datajob.yaml b/docs/api/swagger/openapi-datajob.yaml
index ef435f5..e5a5502 100644 (file)
--- a/docs/api/swagger/openapi-datajob.yaml
+++ b/docs/api/swagger/openapi-datajob.yaml
@@ -17,6 +17,7 @@ paths:
       parameters:
       - description: The destination of the results (Kafka topic name or s3 bucket
           name)
+        explode: true
         in: query
         name: destination
         required: true
@@ -50,6 +51,7 @@ paths:
       parameters:
       - description: The destination of the results (Kafka topic name or s3 bucket
           name)
+        explode: true
         in: query
         name: destination
         required: true
@@ -137,6 +139,7 @@ paths:
         style: simple
       - description: The destination of the results (Kafka topic name or s3 bucket
           name)
+        explode: true
         in: query
         name: destination
         required: true
@@ -191,6 +194,7 @@ components:
       style: simple
     dataProducerIdInQuery:
       description: Identifier for the data producer
+      explode: true
       in: query
       name: dataProducerId
       required: true
@@ -200,6 +204,7 @@ components:
       style: form
     destinationInQuery:
       description: The destination of the results (Kafka topic name or s3 bucket name)
+      explode: true
       in: query
       name: destination
       required: true

diff --git a/docs/api/swagger/openapi.yaml b/docs/api/swagger/openapi.yaml
index bb5d9e5..df9c3f1 100644 (file)
--- a/docs/api/swagger/openapi.yaml
+++ b/docs/api/swagger/openapi.yaml
@@ -4,27 +4,27 @@ info:
   title: NCMP DMI Plugin
   version: 1.0.0
 servers:
-  - url: /dmi
+- url: /dmi
 tags:
-  - description: DMI plugin internal rest apis
-    name: dmi-plugin-internal
-  - description: DMI plugin rest apis
-    name: dmi-plugin
+- description: DMI plugin internal rest apis
+  name: dmi-plugin-internal
+- description: DMI plugin rest apis
+  name: dmi-plugin
 paths:
   /v1/ch/{cmHandle}/modules:
     post:
       description: Get all modules for given cm handle
       operationId: getModuleReferences
       parameters:
-        - description: "The CM handle or alternate identifier for a network function,\
+      - description: "The CM handle or alternate identifier for a network function,\
           \ network element, subnetwork, or any other CM object managed by Network\
           \ CM Proxy"
-          in: path
-          name: cmHandle
-          required: true
-          schema:
-            example: my-cm-handle
-            type: string
+        in: path
+        name: cmHandle
+        required: true
+        schema:
+          example: my-cm-handle
+          type: string
       requestBody:
         content:
           application/json:
@@ -60,21 +60,21 @@ paths:
           description: Internal Server Error
       summary: Get all modules for cm handle
       tags:
-        - dmi-plugin
+      - dmi-plugin
   /v1/ch/{cmHandle}/moduleResources:
     post:
       description: Retrieve module resources for one or more modules
       operationId: retrieveModuleResources
       parameters:
-        - description: "The CM handle or alternate identifier for a network function,\
+      - description: "The CM handle or alternate identifier for a network function,\
           \ network element, subnetwork, or any other CM object managed by Network\
           \ CM Proxy"
-          in: path
-          name: cmHandle
-          required: true
-          schema:
-            example: my-cm-handle
-            type: string
+        in: path
+        name: cmHandle
+        required: true
+        schema:
+          example: my-cm-handle
+          type: string
       requestBody:
         content:
           application/json:
@@ -110,7 +110,7 @@ paths:
           description: Internal Server Error
       summary: Retrieve module resources
       tags:
-        - dmi-plugin
+      - dmi-plugin
   /v1/inventory/cmHandles:
     post:
       description: register given list of cm handles (internal use only)
@@ -152,7 +152,7 @@ paths:
           description: Internal Server Error
       summary: register given list of cm handles (internal use only)
       tags:
-        - dmi-plugin-internal
+      - dmi-plugin-internal
       x-api-audience: component-internal
   /v1/ch/{cmHandle}/data/ds/{datastore-name}:
     post:
@@ -160,55 +160,55 @@ paths:
         cm handle
       operationId: dataAccessPassthrough
       parameters:
-        - description: The type of the requested data
-          in: path
-          name: datastore-name
-          required: true
-          schema:
-            example: ncmp-datastore:passthrough-operational or ncmp-datastore:passthrough-running
-            type: string
-        - description: "The CM handle or alternate identifier for a network function,\
+      - description: The type of the requested data
+        in: path
+        name: datastore-name
+        required: true
+        schema:
+          example: ncmp-datastore:passthrough-operational or ncmp-datastore:passthrough-running
+          type: string
+      - description: "The CM handle or alternate identifier for a network function,\
           \ network element, subnetwork, or any other CM object managed by Network\
           \ CM Proxy"
-          in: path
-          name: cmHandle
-          required: true
-          schema:
-            example: my-cm-handle
-            type: string
-        - description: Resource identifier to get/set the resource data
-          in: query
-          name: resourceIdentifier
-          required: true
-          schema:
-            example: my-schema:my-node
-            type: string
-        - description: "options parameter in query, it is mandatory to wrap key(s)=value(s)\
+        in: path
+        name: cmHandle
+        required: true
+        schema:
+          example: my-cm-handle
+          type: string
+      - description: Resource identifier to get/set the resource data
+        in: query
+        name: resourceIdentifier
+        required: true
+        schema:
+          example: my-schema:my-node
+          type: string
+      - description: "options parameter in query, it is mandatory to wrap key(s)=value(s)\
           \ in parenthesis'()'."
-          examples:
-            sample1:
-              value:
-                options: "(key1=value1,key2=value2)"
-            sample2:
-              value:
-                options: "(key1=value1,key2=value1/value2)"
-            sample3:
-              value:
-                options: "(key1=10,key2=value2,key3=val31,val32)"
-          in: query
-          name: options
-          required: false
-          schema:
-            type: string
-        - description: topic name passed from client(NCMP).
-          examples:
-            sample1:
-              value: my-topic-name
-          in: query
-          name: topic
-          required: false
-          schema:
-            type: string
+        examples:
+          sample1:
+            value:
+              options: "(key1=value1,key2=value2)"
+          sample2:
+            value:
+              options: "(key1=value1,key2=value1/value2)"
+          sample3:
+            value:
+              options: "(key1=10,key2=value2,key3=val31,val32)"
+        in: query
+        name: options
+        required: false
+        schema:
+          type: string
+      - description: topic name passed from client(NCMP).
+        examples:
+          sample1:
+            value: my-topic-name
+        in: query
+        name: topic
+        required: false
+        schema:
+          type: string
       requestBody:
         content:
           application/json:
@@ -222,9 +222,9 @@ paths:
             application/json:
               schema:
                 example:
-                  - yangSource: my-yang-source
-                    moduleName: my-module-name
-                    revision: my-revision
+                - yangSource: my-yang-source
+                  moduleName: my-module-name
+                  revision: my-revision
                 type: object
           description: OK
         "400":
@@ -250,33 +250,33 @@ paths:
       summary: Get resource data from passthrough operational or running for a cm
         handle
       tags:
-        - dmi-plugin
+      - dmi-plugin
   /v1/data:
     post:
       description: Execute a data operation for group of CM handle (IDs or alternate
         IDs) by supplied operation details
       operationId: getResourceDataForCmHandleDataOperation
       parameters:
-        - description: mandatory topic name passed from client(NCMP).
-          examples:
-            sample1:
-              value:
-                topic: my-topic-name
-          in: query
-          name: topic
-          required: true
-          schema:
-            type: string
-        - description: request ID generated by NCMP and is sent here and sent as an
-            acknowledgement for the client request.
-          examples:
-            sample1:
-              value: 4753fc1f-7de2-449a-b306-a6204b5370b3
-          in: query
-          name: requestId
-          required: true
-          schema:
-            type: string
+      - description: mandatory topic name passed from client(NCMP).
+        examples:
+          sample1:
+            value:
+              topic: my-topic-name
+        in: query
+        name: topic
+        required: true
+        schema:
+          type: string
+      - description: request ID generated by NCMP and is sent here and sent as an
+          acknowledgement for the client request.
+        examples:
+          sample1:
+            value: 4753fc1f-7de2-449a-b306-a6204b5370b3
+        in: query
+        name: requestId
+        required: true
+        schema:
+          type: string
       requestBody:
         content:
           application/json:
@@ -318,7 +318,7 @@ paths:
           description: Not Implemented
       summary: Execute a data operation for group of CM handle references.
       tags:
-        - dmi-plugin
+      - dmi-plugin
 components:
   parameters:
     cmHandleInPath:
@@ -463,12 +463,12 @@ components:
     ModuleSet:
       example:
         schemas:
-          - moduleName: my-module-name
-            namespace: my-namespace
-            revision: my-revision
-          - moduleName: my-module-name
-            namespace: my-namespace
-            revision: my-revision
+        - moduleName: my-module-name
+          namespace: my-namespace
+          revision: my-revision
+        - moduleName: my-module-name
+          namespace: my-namespace
+          revision: my-revision
       properties:
         schemas:
           items:
@@ -489,10 +489,10 @@ components:
       example:
         data:
           modules:
-            - name: my-name
-              revision: my-revision
-            - name: my-name
-              revision: my-revision
+          - name: my-name
+            revision: my-revision
+          - name: my-name
+            revision: my-revision
         moduleSetTag: Module-set-tag-1
         cmHandleProperties:
           key: "{\"prop1\":\"value1\",\"prop2\":\"value2\"}"
@@ -532,15 +532,15 @@ components:
     CmHandles:
       example:
         cmHandles:
-          - cmHandleId1
-          - cmHandleId2
-          - cmHandleId3
+        - cmHandleId1
+        - cmHandleId2
+        - cmHandleId3
       properties:
         cmHandles:
           example:
-            - cmHandleId1
-            - cmHandleId2
-            - cmHandleId3
+          - cmHandleId1
+          - cmHandleId2
+          - cmHandleId3
           items:
             type: string
           type: array
@@ -557,11 +557,11 @@ components:
       properties:
         operation:
           enum:
-            - read
-            - create
-            - update
-            - patch
-            - delete
+          - read
+          - create
+          - update
+          - patch
+          - delete
           example: read
           type: string
         dataType:
@@ -637,10 +637,10 @@ components:
     ModuleResourcesReadRequest_data:
       example:
         modules:
-          - name: my-name
-            revision: my-revision
-          - name: my-name
-            revision: my-revision
+        - name: my-name
+          revision: my-revision
+        - name: my-name
+          revision: my-revision
       properties:
         modules:
           items:
@@ -654,16 +654,16 @@ components:
         options: some option
         operationId: "12"
         cmHandles:
-          - id: cmHandle123
-            cmHandleProperties:
-              myProp: some value
-              otherProp: other value
-              moduleSetTag: module-set-tag1
-          - id: cmHandle123
-            cmHandleProperties:
-              myProp: some value
-              otherProp: other value
-              moduleSetTag: module-set-tag1
+        - id: cmHandle123
+          cmHandleProperties:
+            myProp: some value
+            otherProp: other value
+            moduleSetTag: module-set-tag1
+        - id: cmHandle123
+          cmHandleProperties:
+            myProp: some value
+            otherProp: other value
+            moduleSetTag: module-set-tag1
         operation: read
       properties:
         operation:
@@ -688,9 +688,9 @@ components:
             $ref: '#/components/schemas/dmiOperationCmHandle'
           type: array
       required:
-        - cmHandles
-        - datastore
-        - operation
-        - operationId
+      - cmHandles
+      - datastore
+      - operation
+      - operationId
       title: DataOperationRequest
       type: object

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 887f6cf..b4345c1 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -15,6 +15,34 @@ DMI-Plugin Release Notes
     :depth: 2
 ..
 
+..      ====================
+..      * * *   OSLO   * * *
+..      ====================
+
+Version: 1.6.0
+==============
+
+Release Data
+------------
+
++--------------------------------------+--------------------------------------------------------+
+| **CPS Project**                      |  DMI-Plugin                                            |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Docker images**                    | onap/ncmp-dmi-plugin:1.6.0                             |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release designation**              | 1.6.0 Oslo                                             |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release date**                     | (not yet released)                                     |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+
+Features
+--------
+   - `CPS-2499 <https://lf-onap.atlassian.net/browse/CPS-2499>`_  Removed Oparent and fixed the DMI merge master job.
+
 ..      =========================
 ..      * * *   NEW DELHI   * * *
 ..      =========================

diff --git a/pom.xml b/pom.xml
index 1ceed4b..56ab8af 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
 
         <!-- Project Versioning and Timestamp -->
         <cps.groupId>org.onap.cps</cps.groupId>
-        <cps.version>3.5.5-SNAPSHOT</cps.version>
+        <cps.version>3.5.5</cps.version>
         <dmi.groupId>org.onap.cps.ncmp-dmi-plugin</dmi.groupId>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>