[DMAAP-DR] Doc updates for AAF and tlsEnabled

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Id2c216b67ebcd341088842a1f1016d06b7ebf8a7
Issue-ID: DMAAP-1714

diff --git a/docs/apis/data-router-api.rst b/docs/apis/data-router-api.rst
index 1604e62..0b1c0cb 100755 (executable)
--- a/docs/apis/data-router-api.rst
+++ b/docs/apis/data-router-api.rst
@@ -44,12 +44,6 @@ Specifies HTTP Headers, such as Content-Type, that define the parameters of the
 \r
 The HTTP Body contains the feed content when creating a feed.\r
 \r
-**HTTP Authorization**\r
-\r
-The user-id:password pair:\r
-\r
-* If AAF enabled:  A valid AAF AppId to be authenticated and authorized by the AAF CADI framework.\r
-* If Non AAF    :  When publishing or retracting a file, a valid `EID Object`_ with publish permissions.\r
 \r
 Create a Feed\r
 -------------\r
@@ -62,43 +56,35 @@ Create a Feed
 \r
 **Request Parameters:**\r
 \r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| Field                | Description                    | Param Type | Data Type        | MaxLen | Set By | Updatable? | Required |  Valid/Example Values         |\r
-+======================+================================+============+==================+========+========+============+==========+===============================+\r
-| name                 | Feed name                      | Body       | String           | <=20   | Client | N          | Y        |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| version              | Feed version                   | Body       | String           | <=20   | Client | N          | Y        | v1.0.0                        |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| description          | Feed description               | Body       | String           | <=256  | Client | Y          | N        |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| business description | Business description           | Body       | String           | <=256  | Client | Y          | N        |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| authorization        | Information for authorizing    | Body       |`Auth Object`_    |        | Client | Y          | Y        |                               |\r
-|                      | publishing requests            |            |                  |        |        |            |          |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| suspend              | Set to true if the feed is in  | Body       | Boolean          |        | Client | Y          | N        | * true                        |\r
-|                      | the suspended state            |            |                  |        |        |            |          | * false (default)             |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| group-id             | Auth group for feed management | Body       | Integer          |        | Client | Y          | N        | 0 (default)                   |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| aaf_instance         | The instance passed to aaf     | Body       | String           | <=256  | Client | N          | N        | legacy (default)              |\r
-|                      | during permission checks       |            |                  |        |        |            |          |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| Content-Type         | To specify type of message     | Header     | String           |        | Client | N          | Y        | application/vnd.dmaap-dr.feed |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| publisher            | Publisher identity as passed   | Header     | String           | <=8    | DR     | N          | Y        | username                      |\r
-|                      | in X-DMAAP-DR-ON-BEHALF-OF at  |            |                  |        |        |            |          |                               |\r
-|                      | creation time                  |            |                  |        |        |            |          |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| Authorization        | The user / AppId to be         | Header     | String           |        | Client | N          | Y if AAF | dcae@dcae.onap.org:{password} |\r
-|                      | authorized by the AAF CADI     |            |                  |        |        |            | enabled  |                               |\r
-|                      | framework                      |            |                  |        |        |            |          |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| X-EXCLUDE-AAF        | To determine if the feed to    | Header     | Boolean          |        | Client | N          | Y if AAF | * true (for legacy feed)      |\r
-|                      | create is legacy or AAF        |            |                  |        |        |            | enabled  | * false (for AAF feed)        |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
-| Links                | URLs related to this feed      | Body       |`Feed Links Obj`_ |        | DR     | N          | N        |                               |\r
-+----------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| Field                   | Description                    | Param Type | Data Type        | MaxLen | Set By | Updatable? | Required |  Valid/Example Values         |\r
++=========================+================================+============+==================+========+========+============+==========+===============================+\r
+| name                    | Feed name                      | Body       | String           | <=20   | Client | N          | Y        |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| version                 | Feed version                   | Body       | String           | <=20   | Client | N          | Y        | v1.0.0                        |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| description             | Feed description               | Body       | String           | <=256  | Client | Y          | N        |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| business description    | Business description           | Body       | String           | <=256  | Client | Y          | N        |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| authorization           | Information for authorizing    | Body       |`Auth Object`_    |        | Client | Y          | Y        |                               |\r
+|                         | publishing requests            |            |                  |        |        |            |          |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| suspend                 | Set to true if the feed is in  | Body       | Boolean          |        | Client | Y          | N        | * true                        |\r
+|                         | the suspended state            |            |                  |        |        |            |          | * false (default)             |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| group-id                | Auth group for feed management | Body       | Integer          |        | Client | Y          | N        | 0 (default)                   |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| Content-Type            | To specify type of message     | Header     | String           |        | Client | N          | Y        | application/vnd.dmaap-dr.feed |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| Authorization           | The user / AppId to be         | Header     | String           |        | Client | N          | Y        | Basic <credentials>           |\r
+|                         | authorized                     |            |                  |        |        |            |          |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed   | Header     | String           | <=8    | DR     | N          | Y        | username                      |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at  |            |                  |        |        |            |          |                               |\r
+|                         | creation time                  |            |                  |        |        |            |          |                               |\r
++-------------------------+--------------------------------+------------+------------------+--------+--------+------------+----------+-------------------------------+\r
+\r
 \r
 **Response Codes**\r
 \r
@@ -158,17 +144,12 @@ Create a Feed
           {\r
             "password": "dradmin",\r
             "id": "dradmin"\r
-          },\r
-          {\r
-            "password": "demo123456!",\r
-            "id": "onap"\r
           }\r
         ]\r
       },\r
       "name": "ONAP Data Feed",\r
       "business_description": "",\r
-      "aaf_instance": "legacy",\r
-      "publisher": "dradmin",\r
+      "publisher": "{user}",\r
       "links": {\r
         "subscribe": "https://dmaap-dr-prov/subscribe/1",\r
         "log": "https://dmaap-dr-prov/feedlog/1",\r
@@ -191,35 +172,34 @@ Update a Feed
 \r
 **Request Parameters:**\r
 \r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Field                  | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
-+========================+=================================+=============+===============+============+=============+\r
-| name                   | Feed name                       |     Body    |   String      |   <=20     |     Y       |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| description            | Feed description                |     Body    |   String      |   <=256    |     N       |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| business description   | Business description            |     Body    |   String      |   <=256    |     N       |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| authorization          | Information for authorizing     |     Body    |`Auth Object`_ |            |     Y       |\r
-|                        | publishing requests             |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| suspend                | Set to true if the feed is in   |     Body    |   Boolean     |            |     N       |\r
-|                        | the suspended state             |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| group-id               | Auth group for feed management  |     Body    |   Integer     |            |     N       |\r
-|                        |                                 |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Content-type           | To specify type of message      |    Header   |   String      |            |     Y       |\r
-|                        | (feed,subscriber,publisher)     |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| publisher              | Publisher identity as passed    |    Header   |   String      |   <=8      |     Y       |\r
-|                        | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
-|                        | creation time                   |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Authorization          | The user / AppId to be          |    Header   |   String      |            | Y if AAF    |\r
-|                        | authorized by the AAF CADI      |             |               |            | enabled     |\r
-|                        | framework                       |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Field                   | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
++=========================+=================================+=============+===============+============+=============+\r
+| name                    | Feed name                       |     Body    |   String      |   <=20     |     Y       |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| description             | Feed description                |     Body    |   String      |   <=256    |     N       |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| business description    | Business description            |     Body    |   String      |   <=256    |     N       |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| authorization           | Information for authorizing     |     Body    |`Auth Object`_ |            |     Y       |\r
+|                         | publishing requests             |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| suspend                 | Set to true if the feed is in   |     Body    |   Boolean     |            |     N       |\r
+|                         | the suspended state             |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| group-id                | Auth group for feed management  |     Body    |   Integer     |            |     N       |\r
+|                         |                                 |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Content-type            | To specify type of message      |    Header   |   String      |            |     Y       |\r
+|                         | (feed,subscriber,publisher)     |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Authorization           | The user / AppId to be          |    Header   |   String      |            |     Y       |\r
+|                         | authorized                      |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed    |    Header   |   String      | <=8        |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
+|                         | creation time                   |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
 \r
 **Response Codes**\r
 \r
@@ -295,8 +275,7 @@ Update a Feed
       },\r
       "name": "ONAP Data Feed1",\r
       "business_description": "Updated ONAP Feed",\r
-      "aaf_instance": "legacy",\r
-      "publisher": "dradmin",\r
+      "publisher": "{user}",\r
       "links": {\r
         "subscribe": "https://dmaap-dr-prov/subscribe/1",\r
         "log": "https://dmaap-dr-prov/feedlog/1",\r
@@ -319,17 +298,16 @@ Get a Feed
 \r
 **Request Parameters:**\r
 \r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Field                  | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
-+========================+=================================+=============+===============+============+=============+\r
-| publisher              | Publisher identity as passed    |    Header   |   String      |   <=8      |     Y       |\r
-|                        | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
-|                        | creation time                   |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Authorization          | The user / AppId to be          |    Header   |   String      |            | Y if AAF    |\r
-|                        | authorized by the AAF CADI      |             |               |            | enabled     |\r
-|                        | framework                       |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Field                   | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
++=========================+=================================+=============+===============+============+=============+\r
+| Authorization           | The user / AppId to be          |    Header   |   String      |            |     Y       |\r
+|                         | authorized                      |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed    |    Header   |   String      | <=8        |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
+|                         | creation time                   |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
 \r
 **Response Codes**\r
 \r
@@ -367,17 +345,12 @@ Get a Feed
           {\r
             "password": "dradmin",\r
             "id": "dradmin"\r
-          },\r
-          {\r
-            "password": "demo123456!",\r
-            "id": "onap"\r
           }\r
         ]\r
       },\r
       "name": "ONAP Data Feed",\r
       "business_description": "Updated ONAP Feed",\r
-      "aaf_instance": "legacy",\r
-      "publisher": "dradmin",\r
+      "publisher": "{user}",\r
       "links": {\r
         "subscribe": "https://dmaap-dr-prov/subscribe/1",\r
         "log": "https://dmaap-dr-prov/feedlog/1",\r
@@ -399,17 +372,16 @@ Delete a Feed
 \r
 **Request Parameters:**\r
 \r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Field                  | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
-+========================+=================================+=============+===============+============+=============+\r
-| publisher              | Publisher identity as passed    |    Header   |   String      |   <=8      |     Y       |\r
-|                        | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
-|                        | creation time                   |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
-| Authorization          | The user / AppId to be          |    Header   |   String      |            | Y if AAF    |\r
-|                        | authorized by the AAF CADI      |             |               |            | enabled     |\r
-|                        | framework                       |             |               |            |             |\r
-+------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Field                   | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
++=========================+=================================+=============+===============+============+=============+\r
+| Authorization           | The user / AppId to be          |    Header   |   String      |            |     Y       |\r
+|                         | authorized                      |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed    |    Header   |   String      | <=8        |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
+|                         | creation time                   |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
 \r
 **Response Codes**\r
 \r
@@ -438,51 +410,40 @@ Subscribe to Feed
 \r
 **Request Parameters:**\r
 \r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| Field           | Description                     |  Param Type   |  Data Type      | MaxLen | Set By | Updatable? | Required |  Valid/Example Values                |\r
-+=================+=================================+===============+=================+========+========+============+==========+======================================+\r
-| feedId          | ID for the feed you are         |     Path      |   String        |        | Client |     N      |     Y    | 1                                    |\r
-|                 | subscribing to                  |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| delivery        | Address and credentials for     |     Body      | `Del Object`_   |        | Client |     Y      |     Y    |                                      |\r
-|                 | delivery                        |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| follow_redirect | Set to true if feed redirection |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
-|                 | is expected                     |               |                 |        |        |            |          | * false (default)                    |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| metadata_only   | Set to true if subscription is  |     Body      |   Boolean       |        | Client |     Y      |     Y    | * true                               |\r
-|                 | to receive per-file metadata    |               |                 |        |        |            |          | * false                              |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| suspend         | Set to true if the subscription |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
-|                 | is in the suspended state       |               |                 |        |        |            |          | * false (default)                    |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| decompress      | Set to true if the data is to   |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
-|                 | be decompressed for subscriber  |               |                 |        |        |            |          | * false (default)                    |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| group-id        | Auth group for sub management   |     Body      |   Integer       |        | Client |     Y      |     Y    | 22                                   |\r
-|                 |                                 |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| aaf_instance    | The instance passed to aaf      |     Body      |   String        | <=256  | Client |     N      |     N    | * legacy (default)                   |\r
-|                 | during permission checks        |               |                 |        |        |            |          |                                      |\r
-|                 |                                 |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| Content-type    | To specify type of message      |     Header    |   String        |        | Client |     N      |     Y    | application/vnd.dmaap-dr.subscription|\r
-|                 | (feed,subscriber,publisher)     |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| subscriber      | Subscriber identity as passed   |     Header    |   String        |   <=8  |  DR    |     N      |     Y    | username                             |\r
-|                 | in X-DMAAP-DR-ON-BEHALF-OF at   |               |                 |        |        |            |          |                                      |\r
-|                 | creation time                   |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| Authorization   | The user / AppId to be          |    Header     |   String        |        | Client |     N      | Y if AAF | dcae@dcae.onap.org:{password}        |\r
-|                 | authorized by the AAF CADI      |               |                 |        |        |            | enabled  |                                      |\r
-|                 | framework                       |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| X-EXCLUDE-AAF   | To determine if the feed to     |    Header     |   Boolean       |        | Client |     N      | Y if AAF | * true (for legacy feed)             |\r
-|                 | create is legacy or AAF         |               |                 |        |        |            | enabled  | * false (for AAF feed)               |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
-| Links           | URLs related to this            |     Body      |`Sub Links Obj`_ |        |  DR    |     N      |     N    |                                      |\r
-|                 | subscription                    |               |                 |        |        |            |          |                                      |\r
-+-----------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| Field                   | Description                     |  Param Type   |  Data Type      | MaxLen | Set By | Updatable? | Required |  Valid/Example Values                |\r
++=========================+=================================+===============+=================+========+========+============+==========+======================================+\r
+| feedId                  | ID for the feed you are         |     Path      |   String        |        | Client |     N      |     Y    | 1                                    |\r
+|                         | subscribing to                  |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| delivery                | Address and credentials for     |     Body      | `Del Object`_   |        | Client |     Y      |     Y    |                                      |\r
+|                         | delivery                        |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| follow_redirect         | Set to true if feed redirection |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
+|                         | is expected                     |               |                 |        |        |            |          | * false (default)                    |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| metadata_only           | Set to true if subscription is  |     Body      |   Boolean       |        | Client |     Y      |     Y    | * true                               |\r
+|                         | to receive per-file metadata    |               |                 |        |        |            |          | * false                              |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| suspend                 | Set to true if the subscription |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
+|                         | is in the suspended state       |               |                 |        |        |            |          | * false (default)                    |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| decompress              | Set to true if the data is to   |     Body      |   Boolean       |        | Client |     Y      |     N    | * true                               |\r
+|                         | be decompressed for subscriber  |               |                 |        |        |            |          | * false (default)                    |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| group-id                | Auth group for sub management   |     Body      |   Integer       |        | Client |     Y      |     Y    | 22                                   |\r
+|                         |                                 |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| Content-type            | To specify type of message      |     Header    |    String       |        | Client |     N      |     Y    | application/vnd.dmaap-dr.subscription|\r
+|                         | (feed,subscriber,publisher)     |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| Authorization           | The user / AppId to be          |    Header     |    String       |        | Client | N          | Y        | Basic <credentials>                  |\r
+|                         | authorized                      |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed    |    Header     |    String       | <=8    | DR     | N          | Y        | username                             |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |               |                 |        |        |            |          |                                      |\r
+|                         | creation time                   |               |                 |        |        |            |          |                                      |\r
++-------------------------+---------------------------------+---------------+-----------------+--------+--------+------------+----------+--------------------------------------+\r
 \r
 **Response Codes**\r
 \r
@@ -535,12 +496,11 @@ Subscribe to Feed
         "user": "LOGIN",\r
         "url": "http://dmaap-dr-subscriber:7070/"\r
       },\r
-      "subscriber": "onap",\r
+      "subscriber": "{user}",\r
       "groupid": 1,\r
       "metadataOnly": false,\r
       "follow_redirect": true,\r
       "decompress": true,\r
-      "aaf_instance": "legacy",\r
       "links": {\r
         "feed": "https://dmaap-dr-prov/feed/1",\r
         "log": "https://dmaap-dr-prov/sublog/1",\r
@@ -563,44 +523,40 @@ Update subscription
 \r
 **Request Parameters:**\r
 \r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Field           | Description                     |  Param Type  |  Data Type    | MaxLen |  Required   |\r
-+=================+=================================+==============+===============+========+=============+\r
-| subId           | ID for the subscription you are |     Path     |   String      |        |     Y       |\r
-|                 | updating                        |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| delivery        | Address and credentials for     |     Body     | `Del Object`_ |        |     Y       |\r
-|                 | delivery                        |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| follow_redirect | Set to true if feed redirection |     Body     |   Boolean     |        |     N       |\r
-|                 | is expected                     |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| metadata_only   | Set to true if subscription is  |     Body     |   Boolean     |        |     Y       |\r
-|                 | to receive per-file metadata    |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| suspend         | Set to true if the subscription |     Body     |   Boolean     |        |     N       |\r
-|                 | is in the suspended state       |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| decompress      | Set to true if the data is to   |     Body     |   Boolean     |        |     N       |\r
-|                 | be decompressed for subscriber  |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| group-id        | Auth group for sub management   |     Body     |   Integer     |        |     Y       |\r
-|                 |                                 |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Content-type    | To specify type of message      |     Header   |   String      |        |     Y       |\r
-|                 | (feed,subscriber,publisher)     |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| subscriber      | Subscriber identity as passed   |     Header   |   String      |  <=8   |     Y       |\r
-|                 | in X-DMAAP-DR-ON-BEHALF-OF at   |              |               |        |             |\r
-|                 | creation time                   |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Authorization   | The user / AppId to be          |    Header    |   String      |        |  Y if AAF   |\r
-|                 | authorized by the AAF CADI      |              |               |        |  enabled    |\r
-|                 | framework                       |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| X-EXCLUDE-AAF   | To determine if the feed to     |    Header    |   Boolean     |        |  Y if AAF   |\r
-|                 | create is legacy or AAF         |              |               |        |  enabled    |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| Field                   | Description                     |  Param Type  |  Data Type    | MaxLen |  Required   |\r
++=========================+=================================+==============+===============+========+=============+\r
+| subId                   | ID for the subscription you are |     Path     |   String      |        |     Y       |\r
+|                         | updating                        |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| delivery                | Address and credentials for     |     Body     | `Del Object`_ |        |     Y       |\r
+|                         | delivery                        |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| follow_redirect         | Set to true if feed redirection |     Body     |   Boolean     |        |     N       |\r
+|                         | is expected                     |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| metadata_only           | Set to true if subscription is  |     Body     |   Boolean     |        |     Y       |\r
+|                         | to receive per-file metadata    |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| suspend                 | Set to true if the subscription |     Body     |   Boolean     |        |     N       |\r
+|                         | is in the suspended state       |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| decompress              | Set to true if the data is to   |     Body     |   Boolean     |        |     N       |\r
+|                         | be decompressed for subscriber  |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| group-id                | Auth group for sub management   |     Body     |   Integer     |        |     Y       |\r
+|                         |                                 |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| Content-type            | To specify type of message      |     Header   |   String      |        |     Y       |\r
+|                         | (feed,subscriber,publisher)     |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| Authorization           | The user / AppId to be          |    Header    |   String      |        |     Y       |\r
+|                         | authorized                      |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Publisher identity as passed    |    Header    |   String      | <=8    |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |              |               |        |             |\r
+|                         | creation time                   |              |               |        |             |\r
++-------------------------+---------------------------------+--------------+---------------+--------+-------------+\r
 \r
 **Response Codes**\r
 \r
@@ -652,12 +608,11 @@ Update subscription
         "user": "NEW_LOGIN",\r
         "url": "http://dmaap-dr-subscriber:7070/"\r
       },\r
-      "subscriber": "onap",\r
+      "subscriber": "{user}",\r
       "groupid": 67,\r
       "metadataOnly": true,\r
       "follow_redirect": false,\r
       "decompress": false,\r
-      "aaf_instance": "legacy",\r
       "links": {\r
         "feed": "https://dmaap-dr-prov/feed/1",\r
         "log": "https://dmaap-dr-prov/sublog/1",\r
@@ -680,17 +635,17 @@ Get a Subscription
 \r
 **Request Parameters:**\r
 \r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Field           | Description                     |  Param Type  |  Data Type    | MaxLen |  Required   |\r
-+=================+=================================+==============+===============+========+=============+\r
-| subscriber      | Subscriber identity as passed   |    Header    |   String      |  <=8   |     Y       |\r
-|                 | in X-DMAAP-DR-ON-BEHALF-OF at   |              |               |        |             |\r
-|                 | creation time                   |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Authorization   | The user / AppId to be          |    Header    |   String      |        |  Y if AAF   |\r
-|                 | authorized by the AAF CADI      |              |               |        |  enabled    |\r
-|                 | framework                       |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Field                   | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
++=========================+=================================+=============+===============+============+=============+\r
+| Authorization           | The user / AppId to be          |    Header   |   String      |            |     Y       |\r
+|                         | authorized                      |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Subscriber identity as passed   |    Header   |   String      | <=8        |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
+|                         | creation time                   |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+\r
 \r
 **Response Codes**\r
 \r
@@ -721,13 +676,12 @@ Get a Subscription
         "user": "NEW_LOGIN",\r
         "url": "http://dmaap-dr-subscriber:7070/"\r
       },\r
-      "subscriber": "onap",\r
+      "subscriber": "{user}",\r
       "groupid": 67,\r
       "metadataOnly": true,\r
       "privilegedSubscriber": false,\r
       "follow_redirect": false,\r
       "decompress": false,\r
-      "aaf_instance": "legacy",\r
       "links": {\r
         "feed": "https://dmaap-dr-prov/feed/2",\r
         "log": "https://dmaap-dr-prov/sublog/6",\r
@@ -749,17 +703,16 @@ Delete a subscription
 \r
 **Request Parameters:**\r
 \r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Field           | Description                     |  Param Type  |  Data Type    | MaxLen |  Required   |\r
-+=================+=================================+==============+===============+========+=============+\r
-| subscriber      | Subscriber identity as passed   |     Header   |   String      |  <=8   |     Y       |\r
-|                 | in X-DMAAP-DR-ON-BEHALF-OF at   |              |               |        |             |\r
-|                 | creation time                   |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
-| Authorization   | The user / AppId to be          |    Header    |   String      |        |  Y if AAF   |\r
-|                 | authorized by the AAF CADI      |              |               |        |  enabled    |\r
-|                 | framework                       |              |               |        |             |\r
-+-----------------+---------------------------------+--------------+---------------+--------+-------------+\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| Field                   | Description                     |  Param Type |  Data Type    |  MaxLen    |  Required   |\r
++=========================+=================================+=============+===============+============+=============+\r
+| Authorization           | The user / AppId to be          |    Header   |   String      |            |     Y       |\r
+|                         | authorized                      |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
+| X-DMAAP-DR-ON-BEHALF-OF | Subscriber identity as passed   |    Header   |   String      | <=8        |     Y       |\r
+|                         | in X-DMAAP-DR-ON-BEHALF-OF at   |             |               |            |             |\r
+|                         | creation time                   |             |               |            |             |\r
++-------------------------+---------------------------------+-------------+---------------+------------+-------------+\r
 \r
 **Response Codes**\r
 \r
@@ -809,10 +762,8 @@ Publish to Feed
 |                        | * Lowercase boolean             |                  |            |              |             |                                           |\r
 |                        | * null                          |                  |            |              |             |                                           |\r
 +------------------------+---------------------------------+------------------+------------+--------------+-------------+-------------------------------------------+\r
-| Authorization          | An `EID Object`_ with publish   |     Header       |  String    |              |     Y       | * (legacy Feed) dradmin:dradmin           |\r
-|                        | permissions.                    |                  |            |              |             | * (AAF Feed) dcae@dcae.onap.org:{password}|\r
-|                        | If AAF CADI is enabled, use a   |                  |            |              |             |                                           |\r
-|                        | valid AAF user/AppId instead.   |                  |            |              |             |                                           |\r
+| Authorization          | An `EID Object`_ with publish   |     Header       |  String    |              |     Y       | * dradmin:dradmin                         |\r
+|                        | permissions.                    |                  |            |              |             |                                           |\r
 +------------------------+---------------------------------+------------------+------------+--------------+-------------+-------------------------------------------+\r
 \r
 **Response Codes**\r
@@ -846,10 +797,8 @@ Delete/Retract a Published file
 +-----------------+---------------------------------+--------------+---------------+------------+-------------------------------------------+\r
 | Field           | Description                     |  Param Type  |  Data Type    | Required   |  Valid/Example Values                     |\r
 +=================+=================================+==============+===============+============+===========================================+\r
-| Authorization   | An `EID Object`_ with publish   |   Header     |    String     |    Y       | * (legacy Feed) dradmin:dradmin           |\r
-|                 | permissions.                    |              |               |            | * (AAF Feed) dcae@dcae.onap.org:{password}|\r
-|                 | If AAF CADI is enabled, use a   |              |               |            |                                           |\r
-|                 | valid AAF user/AppId instead.   |              |               |            |                                           |\r
+| Authorization   | An `EID Object`_ with publish   |   Header     |    String     |    Y       | * dradmin:dradmin                         |\r
+|                 | permissions.                    |              |               |            |                                           |\r
 +-----------------+---------------------------------+--------------+---------------+------------+-------------------------------------------+\r
 | feedId          | ID of the feed that was         |     Path     |    String     |    Y       |                                           |\r
 |                 | publishing to                   |              |               |            |                                           |\r

diff --git a/docs/apis/drAPI1.json b/docs/apis/drAPI1.json
index 67392a2..7809ca4 100644 (file)
--- a/docs/apis/drAPI1.json
+++ b/docs/apis/drAPI1.json
@@ -766,10 +766,6 @@
           "type": "string",
           "example": ""
         },
-        "aaf_instance": {
-          "type": "string",
-          "example": "legacy"
-        },
         "publisher": {
           "type": "string",
           "example": "dradmin"

diff --git a/docs/architecture.rst b/docs/architecture.rst
index cae6bca..7310573 100644 (file)
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -10,13 +10,6 @@ Capabilities
 The DMaaP Data Router (DR) provisioning API is an HTTPS-based, REST-like API for creating and managing
 DR feeds and subscriptions, which provides a pub/sub architectural model for the transfer of data.
 
-The DR API also supports `AAF CADI authorization <https://docs.onap.org/en/latest/submodules/aaf/authz.git/docs/sections/architecture/cadi.html#authorization>`_.
-
-To use this feature, the API client must provide a valid AAF AppID / MechID with each request.
-To enable this feature, see the :ref:`configuration` section.
-
-.. note:: In future releases, AAF CADI auth will be enabled by default.
-
 Usage Scenarios
 ---------------
 Typically, DR pub clients request the provisioning of a new DR feed.

diff --git a/docs/configuration.rst b/docs/configuration.rst
index f7fa4bc..b55d073 100644 (file)
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -6,38 +6,37 @@
 Configuration
 =============
 
-Configuration properties for both Data Router Provisioning server and Data Router Node server should remain as default values.
+Most configuration properties for both Data Router Provisioning server and Data Router Node server
+should remain as default values.
 
-The only exception to this, is when enabling the AAF CADI framework to authorize the DR provisioning requests.
+An exception to this is when a user wants to run over HTTP (non TLS).
 
-.. note:: The AAF CADI filtering feature is disabled by default. When AAF CADI auth is enabled, all DR API calls must provide an AAF AppID to access the relevant API endpoint.
+For DR Provisioning server config, edit the following props in the provserver.properties file.
 
-To enable DR AAF CADI authorization, the following steps are required:
+.. code-block:: bash
 
-DR CADI Prerequisites:
-    * AAF deployment
+    org.onap.dmaap.datarouter.provserver.tlsenabled  = false
 
-Update the following properties at deployment time.
+and ensure aaf cadi is disabled also
 
+.. code-block:: bash
 
-**DMaaP DR Prov AAF properties**
+    org.onap.dmaap.datarouter.provserver.cadi.enabled = false
 
-::
 
-    # AAF config
-    org.onap.dmaap.datarouter.provserver.cadi.enabled = true
+For DR Node server config, edit the following props in the node.properties file to target http.
 
-    # AAF URL to connect to AAF server
-    org.onap.dmaap.datarouter.provserver.cadi.aaf.url = https://<RELEVANT_AAF_URL>:8095
-
-
-**DMaaP DR Node AAF properties**
-
-::
-
-    # AAF URL to connect to AAF server
-    AafUrl = https://<RELEVANT_AAF_URL>:8095
-
-    # AAF CADI enabled flag
-    CadiEnabled = true
+.. code-block:: bash
 
+    #    URL to retrieve dynamic configuration
+    ProvisioningURL = http://dmaap-dr-prov:8080/internal/prov
+    #
+    #    URL to upload PUB/DEL/EXP logs
+    LogUploadURL = http://dmaap-dr-prov:8080/internal/logs
+    ...
+    #
+    #    AAF CADI enabled flag
+    CadiEnabled = false
+    #
+    #    Enable to run over http or https (default true|https)
+    TlsEnabled = false

diff --git a/docs/images/dr_bc_prov.png b/docs/images/dr_bc_prov.png
index 9e2f7e4..932c655 100644 (file)
Binary files a/docs/images/dr_bc_prov.png and b/docs/images/dr_bc_prov.png differ

diff --git a/docs/images/dr_pub_flow.png b/docs/images/dr_pub_flow.png
index 83af9bd..e3fc036 100644 (file)
Binary files a/docs/images/dr_pub_flow.png and b/docs/images/dr_pub_flow.png differ

diff --git a/pom.xml b/pom.xml
index 5d1c178..ec0aedf 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     </parent>
     <properties>
         <!--revision must also be set in the version.properties file at project root-->
-        <revision>2.1.10-SNAPSHOT</revision>
+        <revision>2.1.11-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>

diff --git a/version.properties b/version.properties
index cd2abb7..d0a3828 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 \r
 major=2\r
 minor=1\r
-patch=10\r
+patch=11\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r