Skip to content

Commit d1825a8

Browse files
author
Christopher Tauchen
authored
Merge pull request #42949 from aireilly/fix-4.10-oc-logs-error
[TELCODOCS-323] - Fix oc logs error + rename example endpoint
2 parents 55b3b18 + 39d2cf1 commit d1825a8

4 files changed

+16
-100
lines changed

modules/cnf-configuring-cvl-nic-as-oc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ ptp-operator-657bbb64c8-2f8sj 1/1 Running 0 43m 10.129.0.61
189189
+
190190
[source,terminal]
191191
----
192-
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp
192+
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp -c linuxptp-daemon-container
193193
----
194194
+
195195
.Example output

modules/cnf-fast-event-notifications-api-refererence.adoc

Lines changed: 13 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,16 @@
33
// * networking/using-ptp.adoc
44

55
[id="cnf-fast-event-notifications-api-refererence_{context}"]
6-
= PTP fast event notifications REST API reference
6+
= Subscribing DU applications to PTP events REST API reference
77

8-
You can use the PTP fast event notifications REST API to subscribe an application to the PTP events that are generated for the parent node. PTP fast events notifications are available on each node where a PTP capable network interface is configured.
8+
Use the PTP event notifications REST API to subscribe a distributed unit (DU) application to the PTP events that are generated on the parent node.
99

10-
You can subscribe distributed unit (DU) applications to PTP event notifications by using the resource address `/cluster/node/<node_name>/ptp`, where `<node_name>` is the cluster node running the DU application.
10+
Subscribe applications to PTP events by using the resource address `/cluster/node/<node_name>/ptp`, where `<node_name>` is the cluster node running the DU application.
1111

12-
The PTP Operator deploys the `linuxptp-daemon` container and the `cloud-event-proxy` sidecar container in a pod managed by the PTP Operator. The `cloud-event-proxy` container collects the PTP events and publishes the events using the `cloud-event-proxy` publisher API at [x-]`http://localhost:8089/api/cloudNotifications/v1/`.
12+
Deploy your `cloud-event-consumer` DU application container and `cloud-event-proxy` sidecar container in a separate DU application pod. The `cloud-event-consumer` DU application subscribes to the `cloud-event-proxy` container in the application pod.
1313

14-
Deploy your DU application container that needs to subscribe to PTP events and a `cloud-event-proxy` sidecar container in a separate DU application pod. The DU application container uses the subscription API provided by the `cloud-event-proxy` container to subscribe to events at [x-]`http://localhost:8089/api/cloudNotifications/v1/`.
14+
Use the following API endpoints to subscribe the `cloud-event-consumer` DU application to PTP events posted by the `cloud-event-proxy` container at [x-]`http://localhost:8089/api/cloudNotifications/v1/` in the DU application pod:
1515

16-
[NOTE]
17-
====
18-
The PTP fast events notifications REST API is provided by `cloud-event-proxy`. To access the API, applications must be in the same pod as the `cloud-event-proxy` container.
19-
====
20-
21-
The following API endpoints are available at [x-]`http://localhost:8089/api/cloudNotifications/v1/` on the DU application pod:
22-
23-
* `/api/cloudNotifications/v1/publishers`
24-
- `POST`: Creates a new publisher
25-
- `GET`: Retrieves a list of publishers
26-
* `/api/cloudNotifications/v1/publishers/<publisher_id>`
27-
- `GET`: Creates a new status ping request for the specified publisher id
2816
* `/api/cloudNotifications/v1/subscriptions`
2917
- `POST`: Creates a new subscription
3018
- `GET`: Retrieves a list of subscriptions
@@ -35,82 +23,10 @@ The following API endpoints are available at [x-]`http://localhost:8089/api/clou
3523
* `/api/cloudNotifications/v1/health`
3624
- `GET`: Returns the health status of `cloudNotifications` API
3725

38-
== api/cloudNotifications/v1/publishers
39-
40-
=== HTTP method
41-
42-
`POST api/cloudNotifications/v1/publishers`
43-
44-
==== Description
45-
46-
Creates a new publisher. If publisher creation is successful, or if it already exists, a `201 Created` status code is returned.
47-
48-
.Query parameters
49-
|===
50-
| Parameter | Type
51-
52-
| publisher
53-
| data
54-
|===
55-
56-
.Example payload
57-
[source,json]
58-
----
59-
{
60-
"uriLocation": "http://localhost:8089/api/cloudNotifications/v1/publishers",
61-
"resource": "/cluster/node/compute-1.example.com/ptp"
62-
}
63-
----
64-
65-
=== HTTP method
66-
67-
`GET api/cloudNotifications/v1/publishers`
68-
69-
==== Description
70-
71-
Returns a list of publishers. If publishers exist, a `200 OK` status code is returned along with the list of publishers.
72-
73-
.Example API response
74-
[source,json]
75-
----
76-
[
77-
{
78-
"id": "56e8a064-dc4b-4428-8085-91c18ea07930",
79-
"endpointUri": "http://localhost:8089/api/cloudNotifications/v1/dummy",
80-
"uriLocation": "http://localhost:8089/api/cloudNotifications/v1/publishers/56e8a064-dc4b-4428-8085-91c18ea07930",
81-
"resource": "/cluster/node/compute-1.example.com/ptp"
82-
}
83-
]
84-
----
85-
86-
== api/cloudNotifications/v1/publishers/<publisher_id>
87-
88-
=== HTTP method
89-
90-
`GET api/cloudNotifications/v1/publishers/<publisher_id>`
91-
92-
==== Description
93-
94-
Returns the publisher with ID `<publisher_id>`.
95-
96-
.Query parameters
97-
|===
98-
| Parameter | Type
99-
100-
| `<publisher_id>`
101-
| string
102-
|===
103-
104-
.Example API response
105-
[source,json]
106-
----
107-
{
108-
"id":"56e8a064-dc4b-4428-8085-91c18ea07930",
109-
"endpointUri":"http://localhost:8089/api/cloudNotifications/v1/dummy",
110-
"uriLocation":"http://localhost:8089/api/cloudNotifications/v1/publishers/56e8a064-dc4b-4428-8085-91c18ea07930",
111-
"resource":"/cluster/node/compute-1.example.com/ptp"
112-
}
113-
----
26+
[NOTE]
27+
====
28+
`9089` is the default port for the `cloud-event-consumer` container deployed in the application pod. You can configure a different port for your DU application as required.
29+
====
11430

11531
== api/cloudNotifications/v1/subscriptions
11632

@@ -128,7 +44,7 @@ Returns a list of subscriptions. If subscriptions exist, a `200 OK` status code
12844
[
12945
{
13046
"id": "75b1ad8f-c807-4c23-acf5-56f4b7ee3826",
131-
"endpointUri": "http://localhost:8089/api/cloudNotifications/v1/dummy",
47+
"endpointUri": "http://localhost:9089/event",
13248
"uriLocation": "http://localhost:8089/api/cloudNotifications/v1/subscriptions/75b1ad8f-c807-4c23-acf5-56f4b7ee3826",
13349
"resource": "/cluster/node/compute-1.example.com/ptp"
13450
}
@@ -179,11 +95,11 @@ Returns details for the subscription with ID `<subscription_id>`
17995
|===
18096

18197
.Example API response
182-
[source,terminal]
98+
[source,json]
18399
----
184100
{
185101
"id":"48210fb3-45be-4ce0-aa9b-41a0e58730ab",
186-
"endpointUri":"http://localhost:8089/api/cloudNotifications/v1/dummy",
102+
"endpointUri": "http://localhost:9089/event",
187103
"uriLocation":"http://localhost:8089/api/cloudNotifications/v1/subscriptions/48210fb3-45be-4ce0-aa9b-41a0e58730ab",
188104
"resource":"/cluster/node/compute-1.example.com/ptp"
189105
}
@@ -207,7 +123,7 @@ Creates a new status ping request for subscription with ID `<subscription_id>`.
207123
| string
208124
|===
209125

210-
.Example output
126+
.Example API response
211127
[source,json]
212128
----
213129
{"status":"ping sent"}

modules/nw-ptp-configuring-linuxptp-services-as-boundary-clock.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ ptp-operator-657bbb64c8-2f8sj 1/1 Running 0 43m 10.129.0.61
205205
+
206206
[source,terminal]
207207
----
208-
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp
208+
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp -c linuxptp-daemon-container
209209
----
210210
+
211211
.Example output

modules/nw-ptp-configuring-linuxptp-services-as-ordinary-clock.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ ptp-operator-657bbb64c8-2f8sj 1/1 Running 0 43m 10.129.0.61
198198
+
199199
[source,terminal]
200200
----
201-
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp
201+
$ oc logs linuxptp-daemon-4xkbb -n openshift-ptp -c linuxptp-daemon-container
202202
----
203203
+
204204
.Example output

0 commit comments

Comments
 (0)