Minor documentation updates.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-721
Change-Id: If05c0e2bc63a8f0144c82248a9c4ddaece451aef

diff --git a/docs/overview.rst b/docs/overview.rst
index 2d3ee66..c96bded 100644 (file)
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -69,9 +69,9 @@ More details available at the `NONRTRIC-Portal documentation site <https://docs.
 Information Coordination Service
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Coordinate/Register Information Types, Producers, Consumers, and Jobs.
+The ICS is a data subscription service which decouples data producers from data consumers. A data consumer can create a data subscription (Information Job) without any knowledge of its data producers (one subscription may involve several data producers). A data producer has the ability to produce one or several types of data (Information Type). One type of data can be produced by zero to many producers.
 
-Coordinate/Register A1-EI Types, Producers, Consumers, and Jobs (A1 Enrichment Information Job Coordination).
+A data consumer can have several active data subscriptions (Information Job). One Information Job consists of the type of data to produce and additional parameters, which may be different for different data types. These parameters are not defined or limited by this service.
 
 * Maintains a registry of:
 
@@ -80,10 +80,7 @@ Coordinate/Register A1-EI Types, Producers, Consumers, and Jobs (A1 Enrichment I
   + Information Consumers
   + Information Jobs
 
-* Information Query API (e.g. per producer, per consumer, per types).
-* Query status of Information jobs.
-* After Information-type/Producer/Consumer/Job is successfully registered delivery/flow can happen directly between Information Producers and Information Consumers.
-* The Information Coordinator Service natively supports the O-RAN A1 Enrichment Information (A1-EI) interface, supporting coordination A1-EI Jobs where information (A1-EI)flow from the SMO/Non-RT-RIC/rApps to near-RT-RICs over the A1 interface.
+The service is not involved in data delivery and hence does not put restrictions on this. 
 
 Implementation:
 
@@ -230,4 +227,4 @@ A very simplified closed-loop rApp use case to re-establish front-haul connectio
 A very simplified closed-loop rApp use case to re-prioritize a RAN slice's radio resource allocation priority if sufficient throughput cannot be maintained. Not intended to to be 'real-world'.
 * Repo: *nonrtric/rapp/ransliceassurance*
 
-More details available at the `documentation site <https://docs.o-ran-sc.org/projects/o-ran-sc-nonrtric-rapp-ransliceassurance>`__.
\ No newline at end of file
+More details available at the `documentation site <https://docs.o-ran-sc.org/projects/o-ran-sc-nonrtric-rapp-ransliceassurance>`__.

diff --git a/information-coordinator-service/api/ics-api.json b/information-coordinator-service/api/ics-api.json
index 56bbcb5..d49398c 100644 (file)
--- a/information-coordinator-service/api/ics-api.json
+++ b/information-coordinator-service/api/ics-api.json
@@ -1244,7 +1244,7 @@
             "name": "Copyright (C) 2020-2022 Nordix Foundation. Licensed under the Apache License.",
             "url": "http://www.apache.org/licenses/LICENSE-2.0"
         },
-        "description": "<h1>API documentation<\/h1><h2>General<\/h2><p>  The service is mainly a broker between data producers and data consumers. A data producer has the ability to produce one or several types of data (Information Type). One type of data can be produced by zero to many producers. <br /><br />A data consumer can have several active data subscriptions (Information Job). One Information Job consists of the type of data to produce and additional parameters for filtering of the data. These parameters are different for different data types.<\/p><h2>APIs provided by the service<\/h2><h4>A1-EI<\/h4><p>  This API is between Near-RT RIC and the Non-RT RIC.  The Near-RT RIC is a data consumer, which creates Information Jobs to subscribe for data.  In this context, the information is referred to as 'Enrichment Information', EI.<\/p><h4>Data producer API<\/h4><p>  This API is provided by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The API is for use by different kinds of data producers and provides support for:<ul><li>Registry of supported information types and which parameters needed to setup a subscription.<\/li><li>Registry of existing data producers.<\/li><li>Callback API provided by producers to setup subscriptions.<\/li><\/ul><\/p><h4>Data consumer API<\/h4><p>  This API is provided by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The API is for use by different kinds of data consumers and provides support for:<ul><li>Querying of available types of data to consume.<\/li><li>Management of data subscription jobs<\/li><li>Optional callback API provided by consumers to get notification on added and removed information types.<\/li><\/ul><\/p><h4>Service status<\/h4><p>  This API provides a means to monitor the health of this service.<\/p>",
+        "description": "<h1>API documentation<\/h1><h2>General<\/h2><p>  The ICS is a data subscription service which decouples data producers from data consumers.  A data consumer can create a data subscription (Information Job) without any knowledge of its data producers (one subscription may involve several data producers).  A data producer has the ability to produce one or several types of data (Information Type).  One type of data can be produced by zero to many producers.  <br /><br />  A data consumer can have several active data subscriptions (Information Job).  One Information Job consists of the type of data to produce and additional parameters, which may be different for different data types.  These parameters are not defined or limited by this service and may for instance include:  <ul>   <li>Parameters related to delivery (Kafka stream, callback URL etc.). These are different for different delivery protocols.<\/li>   <li>Filtering information (scope, filter or other discriminators).<\/li>   <li>Periodicy<\/li>   <li>Other info used for aggregation<\/li>   <ul><\/p><h2>APIs provided by the service<\/h2><h4>A1-EI<\/h4><p>  This API is between Near-RT RIC and the Non-RT RIC.  The Near-RT RIC is a data consumer, which creates Information Jobs to subscribe for data.  In this context, the information is referred to as 'Enrichment Information', EI.<\/p><h4>Data producer API<\/h4><p>  This API is provided by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The API is for use by different kinds of data producers and provides support for:<ul><li>Registry of supported information types and which parameters needed to setup a subscription.<\/li><li>Registry of existing data producers.<\/li><li>Callback API provided by producers to setup subscriptions.<\/li><\/ul><\/p><h4>Data consumer API<\/h4><p>  This API is provided by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The API is for use by different kinds of data consumers and provides support for:<ul><li>Querying of available types of data to consume.<\/li><li>Management of data subscription jobs<\/li><li>Optional callback API provided by consumers to get notification on added and removed information types.<\/li><\/ul><\/p><h4>Service status<\/h4><p>  This API provides a means to monitor the health of this service.<\/p>",
         "title": "Data management and exposure",
         "version": "1.0"
     },

diff --git a/information-coordinator-service/api/ics-api.yaml b/information-coordinator-service/api/ics-api.yaml
index be8fc94..0f73cd0 100644 (file)
--- a/information-coordinator-service/api/ics-api.yaml
+++ b/information-coordinator-service/api/ics-api.yaml
@@ -1,28 +1,34 @@
 openapi: 3.0.1
 info:
   title: Data management and exposure
-  description: <h1>API documentation</h1><h2>General</h2><p>  The service is mainly
-    a broker between data producers and data consumers. A data producer has the ability
-    to produce one or several types of data (Information Type). One type of data can
-    be produced by zero to many producers. <br /><br />A data consumer can have several
-    active data subscriptions (Information Job). One Information Job consists of the
-    type of data to produce and additional parameters for filtering of the data. These
-    parameters are different for different data types.</p><h2>APIs provided by the
-    service</h2><h4>A1-EI</h4><p>  This API is between Near-RT RIC and the Non-RT
-    RIC.  The Near-RT RIC is a data consumer, which creates Information Jobs to subscribe
-    for data.  In this context, the information is referred to as 'Enrichment Information',
-    EI.</p><h4>Data producer API</h4><p>  This API is provided by the Non-RT RIC platform
-    and is intended to be part of the O-RAN R1 interface.  The API is for use by different
-    kinds of data producers and provides support for:<ul><li>Registry of supported
-    information types and which parameters needed to setup a subscription.</li><li>Registry
-    of existing data producers.</li><li>Callback API provided by producers to setup
-    subscriptions.</li></ul></p><h4>Data consumer API</h4><p>  This API is provided
-    by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The
-    API is for use by different kinds of data consumers and provides support for:<ul><li>Querying
-    of available types of data to consume.</li><li>Management of data subscription
-    jobs</li><li>Optional callback API provided by consumers to get notification on
-    added and removed information types.</li></ul></p><h4>Service status</h4><p>  This
-    API provides a means to monitor the health of this service.</p>
+  description: '<h1>API documentation</h1><h2>General</h2><p>  The ICS is a data subscription
+    service which decouples data producers from data consumers.  A data consumer can
+    create a data subscription (Information Job) without any knowledge of its data
+    producers (one subscription may involve several data producers).  A data producer
+    has the ability to produce one or several types of data (Information Type).  One
+    type of data can be produced by zero to many producers.  <br /><br />  A data
+    consumer can have several active data subscriptions (Information Job).  One Information
+    Job consists of the type of data to produce and additional parameters, which may
+    be different for different data types.  These parameters are not defined or limited
+    by this service and may for instance include:  <ul>   <li>Parameters related to
+    delivery (Kafka stream, callback URL etc.). These are different for different
+    delivery protocols.</li>   <li>Filtering information (scope, filter or other discriminators).</li>   <li>Periodicy</li>   <li>Other
+    info used for aggregation</li>   <ul></p><h2>APIs provided by the service</h2><h4>A1-EI</h4><p>  This
+    API is between Near-RT RIC and the Non-RT RIC.  The Near-RT RIC is a data consumer,
+    which creates Information Jobs to subscribe for data.  In this context, the information
+    is referred to as ''Enrichment Information'', EI.</p><h4>Data producer API</h4><p>  This
+    API is provided by the Non-RT RIC platform and is intended to be part of the O-RAN
+    R1 interface.  The API is for use by different kinds of data producers and provides
+    support for:<ul><li>Registry of supported information types and which parameters
+    needed to setup a subscription.</li><li>Registry of existing data producers.</li><li>Callback
+    API provided by producers to setup subscriptions.</li></ul></p><h4>Data consumer
+    API</h4><p>  This API is provided by the Non-RT RIC platform and is intended to
+    be part of the O-RAN R1 interface.  The API is for use by different kinds of data
+    consumers and provides support for:<ul><li>Querying of available types of data
+    to consume.</li><li>Management of data subscription jobs</li><li>Optional callback
+    API provided by consumers to get notification on added and removed information
+    types.</li></ul></p><h4>Service status</h4><p>  This API provides a means to monitor
+    the health of this service.</p>'
   license:
     name: Copyright (C) 2020-2022 Nordix Foundation. Licensed under the Apache License.
     url: http://www.apache.org/licenses/LICENSE-2.0

diff --git a/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java b/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java
index 30c0d4a..98c6e81 100644 (file)
--- a/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java
+++ b/information-coordinator-service/src/main/java/org/oransc/ics/SwaggerConfig.java
@@ -47,7 +47,16 @@ public class SwaggerConfig {
     static final String DESCRIPTION = "<h1>API documentation</h1>" //
         + "<h2>General</h2>" //
         + "<p>" //
-        + "  The service is mainly a broker between data producers and data consumers. A data producer has the ability to produce one or several types of data (Information Type). One type of data can be produced by zero to many producers. <br /><br />A data consumer can have several active data subscriptions (Information Job). One Information Job consists of the type of data to produce and additional parameters for filtering of the data. These parameters are different for different data types." //
+        + "  The ICS is a data subscription service which decouples data producers from data consumers."
+        + "  A data consumer can create a data subscription (Information Job) without any knowledge of its data producers (one subscription may involve several data producers)."
+        + "  A data producer has the ability to produce one or several types of data (Information Type)."
+        + "  One type of data can be produced by zero to many producers." + "  <br /><br />"
+        + "  A data consumer can have several active data subscriptions (Information Job)."
+        + "  One Information Job consists of the type of data to produce and additional parameters, which may be different for different data types." //
+        + "  These parameters are not defined or limited by this service and may for instance include:" + "  <ul>" //
+        + "   <li>Parameters related to delivery (Kafka stream, callback URL etc.). These are different for different delivery protocols.</li>"
+        + "   <li>Filtering information (scope, filter or other discriminators).</li>" + "   <li>Periodicy</li>"
+        + "   <li>Other info used for aggregation</li>" + "   <ul>" //
         + "</p>" //
         + "<h2>APIs provided by the service</h2>" //
         + "<h4>A1-EI</h4>" //