Skip to content

Commit

Permalink
#102 Solve merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
d-gregorczyk committed Nov 1, 2022
2 parents 264411f + ec43021 commit f2732f9
Show file tree
Hide file tree
Showing 29 changed files with 609 additions and 6 deletions.
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:msg="http://standards.ieee.org/downloads/11073/11073-10207-2017/message"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<s12:Header>
<wsa:Action>http://standards.ieee.org/downloads/11073/11073-20701-2018/StateEventService/EpisodicContextReport</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To><!-- ... --></wsa:To>
</s12:Header>
<s12:Body>
<msg:EpisodicContextReport MdibVersion="..." SequenceId="..." InstanceId="...">
<!-- ... -->
</msg:EpisodicContextReport>
</s12:Body>
</s12:Envelope>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:msg="http://standards.ieee.org/downloads/11073/11073-10207-2017/message"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<s12:Header>
<wsa:Action>http://standards.ieee.org/downloads/11073/11073-20701-2018/StateEventService/EpisodicAlertReport</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To><!-- ... --></wsa:To>
</s12:Header>
<s12:Body>
<msg:EpisodicAlertReport MdibVersion="..." SequenceId="..." InstanceId="...">
<!-- ... -->
</msg:EpisodicAlertReport>
</s12:Body>
</s12:Envelope>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:msg="http://standards.ieee.org/downloads/11073/11073-10207-2017/message"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<s12:Header>
<wsa:Action>http://standards.ieee.org/downloads/11073/11073-20701-2018/StateEventService/EpisodicComponentReport</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To><!-- ... --></wsa:To>
</s12:Header>
<s12:Body>
<msg:EpisodicComponentReport MdibVersion="..." SequenceId="..." InstanceId="...">
<!-- ... -->
</msg:EpisodicComponentReport>
</s12:Body>
</s12:Envelope>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:msg="http://standards.ieee.org/downloads/11073/11073-10207-2017/message"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<s12:Header>
<wsa:Action>http://standards.ieee.org/downloads/11073/11073-20701-2018/StateEventService/EpisodicMetricReport</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To><!-- ... --></wsa:To>
</s12:Header>
<s12:Body>
<msg:EpisodicMetricReport MdibVersion="..." SequenceId="..." InstanceId="...">
<!-- ... -->
</msg:EpisodicMetricReport>
</s12:Body>
</s12:Envelope>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:msg="http://standards.ieee.org/downloads/11073/11073-10207-2017/message"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<s12:Header>
<wsa:Action>http://standards.ieee.org/downloads/11073/11073-20701-2018/StateEventService/WaveformStream</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To><!-- ... --></wsa:To>
</s12:Header>
<s12:Body>
<msg:WaveformStream MdibVersion="..." SequenceId="..." InstanceId="...">
<!-- ... -->
</msg:WaveformStream>
</s12:Body>
</s12:Envelope>
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<s12:Envelope
xmlns:dpws="http://docs.oasis-open.org/ws-dd/ns/dpws/2009/01"
xmlns:mdpws="http://standards.ieee.org/downloads/11073/11073-20702-2016"
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xmlns:wsa="http://www.w3.org/2005/08/addressing"
xmlns:wsd="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01">
<s12:Header>
<wsa:Action>http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye</wsa:Action>
<wsa:MessageID><!-- ... --></wsa:MessageID>
<wsa:To>urn:docs-oasis-open-org:ws-dd:ns:discovery:2009:01</wsa:To>
<wsd:AppSequence InstanceId="..." MessageNumber="..."/>
</s12:Header>
<s12:Body>
<wsd:Bye>
<wsa:EndpointReference>
<wsa:Address><!-- ... --></wsa:Address>
</wsa:EndpointReference>
<wsd:Types>dpws:Device mdpws:MedicalDevice</wsd:Types>
<wsd:Scopes><!-- ... --></wsd:Scopes>
<wsd:MetadataVersion><!-- ... --></wsd:MetadataVersion>
</wsd:Bye>
</s12:Body>
</s12:Envelope>
16 changes: 16 additions & 0 deletions SDPi_Supplement/asciidoc/plantuml/vol2-figure-dev-28-sequence.puml
@@ -0,0 +1,16 @@
@startuml

skinparam monochrome true
autonumber

!global $str_somds_consumer = "SOMDS Consumer"
!global $str_somds_provider = "SOMDS Provider"

participant "$str_somds_consumer" as consumer
participant "$str_somds_provider" as provider

== SDPi [DEV-28] Notify Change in System Context and Capabilities ==


consumer <-- provider: Notification(EpisodicContextReport)
@enduml
25 changes: 25 additions & 0 deletions SDPi_Supplement/asciidoc/plantuml/vol2-figure-dev-29-sequence.puml
@@ -0,0 +1,25 @@
@startuml

skinparam monochrome true
autonumber

!global $str_somds_consumer = "SOMDS Consumer"
!global $str_somds_provider = "SOMDS Provider"

participant "$str_somds_consumer" as consumer
participant "$str_somds_provider" as provider

== SDPi [DEV-29] Publish BICEPS Update Reports ==
opt
consumer <-- provider: Notification(EpisodicAlertReport)
end
opt
consumer <-- provider: Notification(EpisodicMetricReport)
end
opt
consumer <-- provider: Notification(EpisodicComponentReport)
end
opt
consumer <-- provider: Notification(WaveformStream)
end
@enduml
19 changes: 19 additions & 0 deletions SDPi_Supplement/asciidoc/plantuml/vol2-figure-dev-34-sequence.puml
@@ -0,0 +1,19 @@
@startuml

skinparam monochrome true
autonumber

!global $str_somds_consumer = "SOMDS Consumer"
!global $str_somds_provider = "SOMDS Provider"

participant "$str_somds_consumer" as consumer
participant "$str_somds_provider" as provider

==SDPi [DEV-34] Announce Network Departure==
|||
group unsecured
provider -> consumer: Bye(Provider UID)
end
|||

@enduml
29 changes: 29 additions & 0 deletions SDPi_Supplement/asciidoc/volume2/dev-28/tf2-ch-a-mdpws-dev-28.adoc
@@ -0,0 +1,29 @@
:var_uri_ws_eventing_notification: https://www.w3.org/Submission/2006/SUBM-WS-Eventing-20060315/#Notifications
:var_uri_dpws_messaging: http://docs.oasis-open.org/ws-dd/dpws/1.1/os/wsdd-dpws-1.1-spec-os.html#_Toc228672084

[#vol2_clause_appendix_mdpws_dev_28]
==== MDPWS: Notify Change in System Context and Capabilities [DEV-28]


// ---------- EpisodicContextReport ---------


===== {var_label_dev_28_message_contextreport} Message

The <<vol2_clause_dev_28_message_notification, {var_label_dev_28_message_contextreport}>> message is encoded by using {var_uri_dpws_messaging}[DPWS Messaging].

====== Referenced Standards

* <<dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]

====== Message Outline

.EpisodicContextReport message
[source#vol2_clause_appendix_a_mdpws_dev_28_contextreport,xml]
----
include::../../listings/vol2-clause-appendix-a-mdpws-dev-28-contextreport.xml[]
----

====== Message Semantics

`s12:Envelope/s12:Body/msg:EpisodicContextReport`:: Updated context information of a <<actor_somds_provider>>.
@@ -0,0 +1,3 @@
// DEV-28 Transaction Summary

This transaction is used to notify a <<actor_somds_consumer>> about changes in system context and capabilities of a <<actor_somds_provider>>.
65 changes: 65 additions & 0 deletions SDPi_Supplement/asciidoc/volume2/dev-28/tf2-dev-28.adoc
@@ -0,0 +1,65 @@
:var_transaction_id: DEV-28

:var_label_dev_28_message_contextreport: Notification


[#vol2_clause_dev_28]
=== Notify Change in System Context and Capabilities [{var_transaction_id}]

==== Scope

include::tf2-dev-28-summary.adoc[]


==== Actor Roles

.Actor Roles {var_transaction_id}
[cols="1,2"]
|===
|Actor |Roles

|<<actor_somds_consumer>>
|Listens for a <<vol2_clause_dev_28_message_notification, {var_label_dev_28_message_contextreport}>> message to retrieve context updates.

|<<actor_somds_provider>>
|While a subscription is running, the <<actor_somds_provider>> delivers <<vol2_clause_dev_28_message_notification, {var_label_dev_28_message_contextreport}>> messages.

|===

==== Referenced Standards

* <<ieee_11073_10207_2017>> Section 7.4 Message Model

==== Messages

.Message Interaction Diagram {var_transaction_id}
[plantuml#vol2_figure_dev_28_sequence, target=puml-dev-28-sequence, format=svg, reftext='{figure-caption} {counter:refnum}',width=100%]
....
include::../../plantuml/vol2-figure-dev-28-sequence.puml[]
....


// ---------- EpisodicContextReport ---------


[#vol2_clause_dev_28_message_notification]
===== {var_label_dev_28_message_contextreport} Message

The {var_label_dev_28_message_contextreport} message contains updated context data and is delivered by a <<actor_somds_provider>> to subscribed <<actor_somds_consumer>>s.

[#vol2_clause_dev_28_message_notification_trigger_events]
====== Trigger Events

The {var_label_dev_28_message_contextreport} message is sent whenever a context of a <<actor_somds_provider>> is updated and a <<actor_somds_consumer>> is subscribed to context reports of a <<actor_somds_provider>>.

[#vol2_clause_dev_28_message_notification_semantics]
====== Message Semantics

[[payload_dev_28_notification_cotext]]EpisodicContextReport:: A change report that contains context information.

[#vol2_clause_dev_28_message_contextreport_expected_actions]
====== Expected Actions

When a <<actor_somds_provider>> sends this message, there is no expected action or required responses.

:!var_transaction_id:
99 changes: 99 additions & 0 deletions SDPi_Supplement/asciidoc/volume2/dev-29/tf2-ch-a-mdpws-dev-29.adoc
@@ -0,0 +1,99 @@
:var_uri_ws_eventing_notification: https://www.w3.org/Submission/2006/SUBM-WS-Eventing-20060315/#Notifications
:var_label_dev_29_message_alertreport: EpisodicAlertReport
:var_label_dev_29_message_metricreport: EpisodicMetricReport
:var_label_dev_29_message_componentreport: EpisodicComponentReport
:var_label_dev_29_message_waveformstream: WaveformStream
:var_uri_dpws_messaging: http://docs.oasis-open.org/ws-dd/dpws/1.1/os/wsdd-dpws-1.1-spec-os.html#_Toc228672084

[#vol2_clause_appendix_mdpws_dev_29]
==== MDPWS: Publish BICEPS Update Reports [DEV-29]


// ---------- EpisodicAlertReport ---------


===== {var_label_dev_29_message_alertreport} Message

The <<vol2_clause_dev_29_message_notification, {var_label_dev_29_message_alertreport}>> message is encoded by using {var_uri_dpws_messaging}[DPWS Messaging].

====== Referenced Standards

* <<dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]

====== Message Outline

.EpisodicAlertReport message
[source#vol2_clause_appendix_a_mdpws_dev_29_alertreport,xml]
----
include::../../listings/vol2-clause-appendix-a-mdpws-dev-29-alertreport.xml[]
----

====== Message Semantics

`s12:Envelope/s12:Body/msg:EpisodicAlertReport`:: Updated alert information of a <<actor_somds_provider>>.

// ---------- EpisodicMetricReport ---------

===== {var_label_dev_29_message_metricreport} Message

The <<vol2_clause_dev_29_message_notification, {var_label_dev_29_message_metricreport}>> message is encoded by using {var_uri_dpws_messaging}[DPWS Messaging].

====== Referenced Standards

* <<dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]

====== Message Outline

.EpisodicMetricReport message
[source#vol2_clause_appendix_a_mdpws_dev_29_metricreport,xml]
----
include::../../listings/vol2-clause-appendix-a-mdpws-dev-29-metricreport.xml[]
----

====== Message Semantics

`s12:Envelope/s12:Body/msg:EpisodicMetricReport`:: Updated metric information of a <<actor_somds_provider>>.

// ---------- EpisodicComponentReport ---------

===== {var_label_dev_29_message_componentreport} Message

The <<vol2_clause_dev_29_message_notification, {var_label_dev_29_message_componentreport}>> message is encoded by using {var_uri_dpws_messaging}[DPWS Messaging].

====== Referenced Standards

* <<dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]

====== Message Outline

.EpisodicComponentReport message
[source#vol2_clause_appendix_a_mdpws_dev_29_componentreport,xml]
----
include::../../listings/vol2-clause-appendix-a-mdpws-dev-29-componentreport.xml[]
----

====== Message Semantics

`s12:Envelope/s12:Body/msg:EpisodicComponentReport`:: Updated component information of a <<actor_somds_provider>>.

// ---------- WaveformStream ---------

===== {var_label_dev_29_message_waveformstream} Message

The <<vol2_clause_dev_29_message_notification, {var_label_dev_29_message_waveformstream}>> message is encoded by using {var_uri_dpws_messaging}[DPWS Messaging].

====== Referenced Standards

* <<dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]

====== Message Outline

.WaveformStream message
[source#vol2_clause_appendix_a_mdpws_dev_29_waveformstream,xml]
----
include::../../listings/vol2-clause-appendix-a-mdpws-dev-29-waveformstream.xml[]
----

====== Message Semantics

`s12:Envelope/s12:Body/msg:WaveformStream`:: Waveform stream of a <<actor_somds_provider>>.
@@ -0,0 +1,3 @@
// DEV-29 Transaction Summary

This transaction is used to notify a <<actor_somds_consumer>> about changes in the alert, metric and component reports and in the waveform stream of a <<actor_somds_provider>>.

0 comments on commit f2732f9

Please sign in to comment.