diff --git a/GS_NFV-SOL_026.md b/GS_NFV-SOL_026.md index 4599da14eb3c8217dc7f50eab6333525e4ff19c5..5b2044026567d294e4782a5d0665e06a294b0815 100644 --- a/GS_NFV-SOL_026.md +++ b/GS_NFV-SOL_026.md @@ -428,7 +428,7 @@ The modification of an individual Computer System resource, as illustrated in Fi 1. The API consumer sends a PATCH request to the Individual Computer System resource, including data structure in the message content body representing the modifiable properties to be modified in the individual computer system resource. 1. If the PIM supports asynchronous operations and modification of the computer system resource requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM modifies the Individual Computer System resource. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified Computer System resource. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified Computer System resource. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the Individual Computer System resource has been modified. @@ -449,7 +449,7 @@ The replacement of an individual Computer System resource, as illustrated in Fig 1. The API consumer sends a PUT request to the Individual Computer System resource including a valid representation of the individual Computer System resource to be replaced in the message content body. 1. If the PIM supports asynchronous operations and replacement of the computer system resource requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM replaces the Individual Computer System resource. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced Computer System resource. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced Computer System resource. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the Individual Computer System resource has been replaced. @@ -470,7 +470,7 @@ The deletion of an individual Computer System resource, as illustrated in Figure 1. The API consumer sends a DELETE request to the Individual Computer System resource. 1. If the PIM supports asynchronous operations and deletion of the computer system resource requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM deletes the individual Computer System resource. -1. The PIM returns a "204 No Content " response to the API consumer indicating that the resource has been successfully deleted. +1. The PIM returns a "204 No Content " response to the API consumer indicating that the resource has been successfully deleted. Alternatively, the PIM can also return a "200 OK" response to the API consumer including a representation of the deleted Computer System resource in the message content body. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the Individual Computer System resource has been deleted. @@ -857,7 +857,7 @@ The modification of a topology object, as illustrated in Figure 8.4.41, consists 1. The API consumer sends a PATCH request to the <topology object URI>, including data structure in the message content body representing the modifiable properties to be modified in the individual topology object. 1. If the PIM supports asynchronous operations and modification of the topology object requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM modifies the individual topology object. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified topology object. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified topology object. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the individual topology object has been modified. @@ -878,7 +878,7 @@ The replacement of an individual topology object, as illustrated in Figure 8.4.5 1. The API consumer sends a PUT request to the <topology object URI> including a valid representation of the individual topology object to be replaced in the message content body. 1. If the PIM supports asynchronous operations and replacement of the topology object requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM replaces the individual topology object. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced topology object. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced topology object. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the individual topology object has been replaced. @@ -899,7 +899,7 @@ The deletion of an individual topology object, as illustrated in Figure 8.4.6-1, 1. The API consumer sends a DELETE request to the <topology object URI>. 1. If the PIM supports asynchronous operations and deletion of the topology object requires some time to process, the PIM returns a "202 Accepted" response. The response also contains the URI of the associated Task Monitor in the Location header. The response body can optionally contain representation of the corresponding Task resource created by the PIM for this asynchronous operation. 1. The PIM deletes the individual topology object. -1. The PIM returns a "204 No Content " response to the API consumer indicating that the topology object has been successfully deleted. +1. The PIM returns a "204 No Content " response to the API consumer indicating that the topology object has been successfully deleted. Alternatively, the PIM can also return a "200 OK" response to the API consumer including a representation of the deleted topology object in the message content body. **Postcondition:** Upon successful completion of the synchronous operation or of the corresponding task in case of asynchronous operation, the individual topology object has been deleted. @@ -1135,13 +1135,13 @@ The procedure consists of the following steps as illustrated in figure A.2-1: 1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the individual Subscription resource. 1. The API consumer sends a PATCH request to the Individual Subscription resource, including data structure in the message content body representing the modifiable properties to be modified in the Individual Subscription resource. 1. The PIM modifies the Individual Subscription resource. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified Subscription resource. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the modified Subscription resource. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. 1. The API consumer sends a PUT request to the Individual Subscription resource including a valid representation of the individual Subscription resource to be replaced in the message content body. 1. The PIM replaces the Individual Subscription resource. -1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced Subscription resource. +1. The PIM returns a "200 OK" response to the API consumer and includes in the message content body a representation of the replaced Subscription resource. Alternatively, the PIM can also return a "204 No Content" response to the API consumer indicating successful operation. 1. The API consumer sends a DELETE request to the Individual Subscription resource. 1. The PIM deletes the individual Subscription resource. -1. The PIM returns a "204 No Content " response to the API consumer indicating that the resource has been successfully deleted. +1. The PIM returns a "204 No Content " response to the API consumer indicating that the resource has been successfully deleted. Alternatively, the PIM can also return a "200 OK" response to the API consumer including a representation of the deleted Subscription resource in the message content body. **Error handling:** The PIM rejects a subscription management request if the subscription representation in the creation or replacement request is not valid, or properties in the modify request are not modifiable, etc. In case of failure, appropriate error information is provided in the response. diff --git a/media/image15.png b/media/image15.png index c848beffe369407680f9d266fdb65b13704a8f5f..7ed8523d9294eae91d81fc9a4ca4752b52339543 100644 Binary files a/media/image15.png and b/media/image15.png differ diff --git a/media/image16.png b/media/image16.png index c669ad3e20318ff7f02a19b0ce611d6a6de6b9a1..8042d04dd8a4fc9220329530c27de9d61268eb89 100644 Binary files a/media/image16.png and b/media/image16.png differ diff --git a/media/image17.png b/media/image17.png index 638e8a5638cdf2a1587e8ff6fa5806bf9839951a..b7b2fa428eda3670bbfd3a4d06ad5fe0f98929bd 100644 Binary files a/media/image17.png and b/media/image17.png differ diff --git a/media/image18.png b/media/image18.png index 20bf9dba512e30a71cefcd1e3a76d2ec03514348..d8a7f23de3f1defd3995a91f90ae6d4a097007ba 100644 Binary files a/media/image18.png and b/media/image18.png differ diff --git a/media/image21.png b/media/image21.png index b25a87e88c2eb8051fd1018c1cfde12ed4416485..49004fc5ff41d46ad0cb2f1e52090f0f1f276db6 100644 Binary files a/media/image21.png and b/media/image21.png differ diff --git a/media/image7.png b/media/image7.png index 94790d45bfcb2c70f2bc07989e8a64da21e5e6d9..2f75d5c90e19633447555f7f60f26b6d99228c92 100644 Binary files a/media/image7.png and b/media/image7.png differ diff --git a/media/image8.png b/media/image8.png index f938a71bbf5932bea5344aba538e988d32c4933b..3beba05a65a7385a6c241e2be30a5b7e301ddd44 100644 Binary files a/media/image8.png and b/media/image8.png differ diff --git a/media/image9.png b/media/image9.png index 80dbc627ef5134f82a56dc5388f9c72878b0cfa9..710523152b52101dd3dc95f7d7dadce404bb53d8 100644 Binary files a/media/image9.png and b/media/image9.png differ diff --git a/uml/AnnexA/subscription-management.txt b/uml/AnnexA/subscription-management.txt index aaf55e76ff13ea5c3afa682d44800c1d074e20fe..20840a15d77c3725b8fd8194d232ace852be11ec 100644 --- a/uml/AnnexA/subscription-management.txt +++ b/uml/AnnexA/subscription-management.txt @@ -30,7 +30,7 @@ cli -> srv: PATCH .../redfish/v1/EventService/Subscriptions/{SubscriptionId} (Pa autonumber 9 srv -> srv: Modifies individual\nSubscription resource autonumber 10 -cli <- srv: 200 OK (Subscription) +cli <- srv: 200 OK (Subscription) / 204 No Content note over cli API consumer decides to replace an individual subscription @@ -40,7 +40,7 @@ cli -> srv: PUT .../redfish/v1/EventService/Subscriptions/{SubscriptionId} (Subs autonumber 12 srv -> srv: Replaces individual\nSubscription resource autonumber 13 -cli <- srv: 200 OK (Subscription) +cli <- srv: 200 OK (Subscription) / 204 No Content note over cli API consumer does not need an individual subscription anymore @@ -50,7 +50,7 @@ cli -> srv: DELETE .../redfish/v1/EventService/Subscriptions/{SubscriptionId} autonumber 15 srv -> srv: Deletes individual\nSubscription resource autonumber 16 -cli <- srv: 204 No Content +cli <- srv: 204 No Content / 200 OK (Subscription) autonumber stop @enduml diff --git a/uml/AnnexA/task-monitoring-sub-notify-method.txt b/uml/AnnexA/task-monitoring-sub-notify-method.txt index 9e9a5b3d2e86d843a6cacb16200e98f33d86daab..7c62d3eb0106c3cfcb3a951a271edf545bf2bf03 100644 --- a/uml/AnnexA/task-monitoring-sub-notify-method.txt +++ b/uml/AnnexA/task-monitoring-sub-notify-method.txt @@ -22,7 +22,7 @@ skinparam defaultFontSize 11 autonumber 4 srv -> srv: Updates the task state\n in the Task resource autonumber 5 - srv -> cli: Post {NotificationTargetUri} (Notification) + srv -> cli: POST {NotificationTargetUri} (Notification) autonumber 6 cli -> srv: GET .../redfish/v1/TaskService/TaskMonitors/{TaskMonitorId} autonumber 7 diff --git a/uml/Clause6/delete-computer-system.txt b/uml/Clause6/delete-computer-system.txt index 398a631c76b047d0043cd29e149ebe27cfac102a..dcab156d8fbfd90b1ab5f2a0fe3f2da739653c8c 100644 --- a/uml/Clause6/delete-computer-system.txt +++ b/uml/Clause6/delete-computer-system.txt @@ -15,7 +15,7 @@ else Synchronous Operation autonumber 3 srv -> srv: Deletes individual\nComputer System\nresource autonumber 4 - cli <- srv: 204 No Content + cli <- srv: 204 No Content / 200 OK (ComputerSystem) autonumber stop end note over cli, srv diff --git a/uml/Clause6/modify-computer-system.txt b/uml/Clause6/modify-computer-system.txt index e34e029b3bdda413339d0a0ad975280a32b17b72..8988f704bb222b80c8ef49a5a9f52586a0890814 100644 --- a/uml/Clause6/modify-computer-system.txt +++ b/uml/Clause6/modify-computer-system.txt @@ -15,7 +15,7 @@ else Synchronous Operation autonumber 3 srv -> srv: Modifies individual\nComputer System\nresource autonumber 4 - cli <- srv: 200 OK (ComputerSystem) + cli <- srv: 200 OK (ComputerSystem) / 204 No Content autonumber stop end note over cli, srv diff --git a/uml/Clause6/replace-computer-system.txt b/uml/Clause6/replace-computer-system.txt index 3fec9b91bd2096654b171a59655fcad33493fb96..dda83e0a42c10a46372584403204822841abf8be 100644 --- a/uml/Clause6/replace-computer-system.txt +++ b/uml/Clause6/replace-computer-system.txt @@ -15,7 +15,7 @@ else Synchronous Operation autonumber 3 srv -> srv: Replaces individual\nComputer System\nresource autonumber 4 - cli <- srv: 200 OK (ComputerSystem) + cli <- srv: 200 OK (ComputerSystem) / 204 No Content autonumber stop end note over cli, srv diff --git a/uml/Clause8/delete-topology-object.txt b/uml/Clause8/delete-topology-object.txt index ceb1c4c135f8ec55e30d175bfd693d791931326f..16795e3d8b552289e9b0cff1b524b279b4a6d76c 100644 --- a/uml/Clause8/delete-topology-object.txt +++ b/uml/Clause8/delete-topology-object.txt @@ -12,7 +12,7 @@ alt Asynchronous Operation cli <- srv: 202 Accepted else Synchronous Operation srv -> srv: Deletes individual\ntopology object - cli <- srv: 204 No Content + cli <- srv: 204 No Content / 200 OK () autonumber stop end note over cli, srv diff --git a/uml/Clause8/modify-topology-object.txt b/uml/Clause8/modify-topology-object.txt index d8359e8005cf0af73593cdcd21b304f807a72ed6..42ffbeac309b106e112ef8070fec72c075715bfb 100644 --- a/uml/Clause8/modify-topology-object.txt +++ b/uml/Clause8/modify-topology-object.txt @@ -12,7 +12,7 @@ alt Asynchronous Operation cli <- srv: 202 Accepted else Synchronous Operation srv -> srv: Modifies individual\ntopology object - cli <- srv: 200 OK () + cli <- srv: 200 OK () / 204 No Content autonumber stop end note over cli, srv diff --git a/uml/Clause8/replace-topology-object.txt b/uml/Clause8/replace-topology-object.txt index 2a17c5df326a3200bdfc74e0b8ad3c56f1be2464..4d3e69869b49e527a9df80584a2a0c1edfdcd196 100644 --- a/uml/Clause8/replace-topology-object.txt +++ b/uml/Clause8/replace-topology-object.txt @@ -12,7 +12,7 @@ alt Asynchronous Operation cli <- srv: 202 Accepted else Synchronous Operation srv -> srv: Replaces individual\ntopology object - cli <- srv: 200 OK () + cli <- srv: 200 OK () / 204 No Content autonumber stop end note over cli, srv