#152 Add discovery proxy sources and additional chapter

IHE · Aug 2, 2024 · ee89e19 · ee89e19
1 parent 9d31a40
commit ee89e19
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 2 deletions.
diff --git a/asciidoc/volume0/tf0-main.adoc b/asciidoc/volume0/tf0-main.adoc
@@ -42,7 +42,11 @@ The choice of any namespace prefix is arbitrary and not semantically significant
 
 |sdpi
 |urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.1.1
-|This specification
+|This specification, used by <<acronym_biceps>> extensions.
+
+|dp
+|urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.2.2
+|This specification, used by the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> actor.
 
 |wsa
 |http://www.w3.org/2005/08/addressing

diff --git a/asciidoc/volume2/dev-46/tf2-ch-a-mdpws-dev-46.adoc b/asciidoc/volume2/dev-46/tf2-ch-a-mdpws-dev-46.adoc
@@ -12,6 +12,7 @@
 
 This section specifies the MDPWS data transmission for messages defined in <<vol2_clause_dev_46>>.
 
+Additional implementation directions are defined in <<vol2_clause_appendix_mdpws_discovery_proxy>>.
 
 // ---------- Hello ---------
 

diff --git a/asciidoc/volume2/dev-47/tf2-ch-a-mdpws-dev-47.adoc b/asciidoc/volume2/dev-47/tf2-ch-a-mdpws-dev-47.adoc
@@ -10,6 +10,8 @@
 
 This section specifies the MDPWS data transmission for messages defined in <<vol2_clause_dev_47>>.
 
+Additional implementation directions are defined in <<vol2_clause_appendix_mdpws_discovery_proxy>>.
+
 // ---------- Hello ---------
 
 ===== {var_label_dev_47_message_hello} Message
@@ -20,6 +22,7 @@ The <<vol2_clause_dev_47_message_hello, {var_label_dev_47_message_hello}>> messa
 
 * <<ref_oasis_dpws_2009>> {var_uri_dpws_messaging}[Section 2 Messaging]
 * <<ref_oasis_ws_discovery_2009>> {var_uri_ws_discovery_hello}[Section 4.1 Hello]
+* <<ref_oasis_ws_discovery_2009>> {var_uri_ws_discovery_hello}[Section 4.1 Hello]
 
 ====== Message Outline
 
@@ -216,4 +219,4 @@ include::../dev-a-default-trigger-events.adoc[]
 `s12:Envelope/s12:Body/wsd:ResolveMatches/wsd:ResolveMatch/wsd:MetadataVersion`:: A metadata version of the <<vol1_spec_sdpi_p_actor_somds_provider>>.
 
 :var_expected_actions_ref: <<vol2_clause_dev_47_message_resolve_match>>
-include::../dev-a-default-expected-actions.adoc[]
+include::../dev-a-default-expected-actions.adoc[]
diff --git a/asciidoc/volume2/discovery-proxy/tf2-ch-a-mdpws-discovery-proxy.adoc b/asciidoc/volume2/discovery-proxy/tf2-ch-a-mdpws-discovery-proxy.adoc
@@ -0,0 +1,77 @@
+[#vol2_clause_appendix_mdpws_discovery_proxy]
+==== SOMDS Discovery Proxy implementation requirements
+
+This chapter describes requirements to the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> <<acronym_mdpws>> binding that go beyond message outlines and semantics specified in <<vol2_clause_dev_46>> and <<vol2_clause_dev_47>>.
+
+.R7007
+[sdpi_requirement#r7007,sdpi_req_level=shall]
+****
+
+A <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> shall provide the Discovery Proxy service by implementing the port type
+with the <<term_q_name>> dp:DiscoveryProxy.
+
+NOTE: The <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> port type is defined in <<vol2_clause_appendix_a_mdpws_wsdl>>.
+NOTE: The OID used for the target namespace of the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> WSDL file is listed in <<vol2_table_appendix_mdpws_discovery_proxy_oids>>.
+****
+
+.R7008
+[sdpi_requirement#r7008,sdpi_req_level=shall]
+****
+
+A <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> shall accept the WS-Eventing wse:Filter@Dialect
+urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.2.1.
+
+NOTE: The OID used for the filter dialect is listed in <<vol2_table_appendix_mdpws_discovery_proxy_oids>>.
+****
+
+.R7009
+[sdpi_requirement#r7009,sdpi_req_level=shall]
+****
+
+A <<vol1_spec_sdpi_p_actor_somds_consumer>> shall add the filter dialect urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.2.1 to
+every Subscribe request to a <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>>.
+
+NOTE: The OID used for the filter dialect is listed in <<vol2_table_appendix_mdpws_discovery_proxy_oids>>.
+****
+
+===== Utilized OIDs
+
+All object identifiers used by the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> are specified in <<vol2_table_appendix_mdpws_discovery_proxy_oids>>.
+
+[#vol2_table_appendix_mdpws_discovery_proxy_oids]
+.WS-Eventing subscription filter dialect OID assignment
+[cols="2,3,1",options="autowidth, header"]
+|===
+| Primary identifier
+| Concept description
+| Secondary identifier
+
+| 1.3.6.1.4.1.19376.1.6.2.10
+| Profile specific OID for SDPi
+| sdpi
+
+| 1.3.6.1.4.1.19376.1.6.2.10.1
+| Describes namespaces for different purposes as specified by its sub-nodes
+| namespaces
+
+| 1.3.6.1.4.1.19376.1.6.2.10.1.2
+| Identifies <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> objects.
+| discovery-proxy
+
+| 1.3.6.1.4.1.19376.1.6.2.10.1.2.1
+| Subscription filter dialect used to identify Hello/Bye subscriptions provided by a <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>>.
+| subscription-filter
+
+| 1.3.6.1.4.1.19376.1.6.2.10.1.2.2
+| WSDL target namespace identifier for the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> actor.
+| wsdl
+|===
+
+===== Discovery Proxy WSDL
+
+<<vol2_clause_appendix_a_mdpws_wsdl>> shows the WSDL file that specifies the <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>> Web Service interface.
+
+[source#vol2_clause_appendix_a_mdpws_wsdl,xml]
+----
+include::../../../sources/discovery-proxy/DiscoveryProxy.wsdl[]
+----
diff --git a/asciidoc/volume2/tf2-ch-a-mdpws.adoc b/asciidoc/volume2/tf2-ch-a-mdpws.adoc
@@ -59,6 +59,7 @@ include::dev-46/tf2-ch-a-mdpws-dev-46.adoc[]
 
 include::dev-47/tf2-ch-a-mdpws-dev-47.adoc[]
 
+include::discovery-proxy/tf2-ch-a-mdpws-discovery-proxy.adoc[]
 
 === Security Considerations
 

diff --git a/asciidoc/volume3/tf3-ch-b-biceps-extension-namespace.adoc b/asciidoc/volume3/tf3-ch-b-biceps-extension-namespace.adoc
@@ -30,4 +30,8 @@ A comprehensive listing of OIDs within the IHE Devices namespace is shown at the
 | Major version 1 for extensions to the BICEPS Participant and Message Model.
   In order to avoid proliferation of OIDs below `1.3.6.1.4.1.19376.1.6.2.10.1.1`, versions are incremented only if incompatible changes are made to an extension.
 | version1
+
+| 1.3.6.1.4.1.19376.1.6.2.10.1.2
+| Subscription filter dialect used to identify Hello/Bye subscriptions provided by a <<vol1_spec_sdpi_p_actor_somds_discovery_proxy>>.
+| subscription-filter
 |===
diff --git a/sources/discovery-proxy/DiscoveryProxy.wsdl b/sources/discovery-proxy/DiscoveryProxy.wsdl
@@ -0,0 +1,100 @@
+<wsdl:definitions
+		targetNamespace="urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.2.2"
+		xmlns:dp="urn:oid:1.3.6.1.4.1.19376.1.6.2.10.1.2.2"
+		xmlns:dpws="http://docs.oasis-open.org/ws-dd/ns/dpws/2009/01"
+		xmlns:s12="http://schemas.xmlsoap.org/wsdl/soap12/"
+		xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+		xmlns:wsdd="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+		xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		xmlns:wse="http://schemas.xmlsoap.org/ws/2004/08/eventing"
+		xmlns:wsp="http://www.w3.org/ns/ws-policy">
+	<wsdl:import namespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01" location="http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd"/>
+	<wsdl:message name="HelloMessage">
+		<wsdl:part name="parameters" element="wsdd:Hello"/>
+	</wsdl:message>
+	<wsdl:message name="ByeMessage">
+		<wsdl:part name="parameters" element="wsdd:Bye"/>
+	</wsdl:message>
+	<wsdl:message name="ProbeMessage">
+		<wsdl:part name="parameters" element="wsdd:Probe"/>
+	</wsdl:message>
+	<wsdl:message name="ProbeMatchMessage">
+		<wsdl:part name="parameters" element="wsdd:ProbeMatches"/>
+	</wsdl:message>
+	<wsdl:message name="ResolveMessage">
+		<wsdl:part name="parameters" element="wsdd:Resolve"/>
+	</wsdl:message>
+	<wsdl:message name="ResolveMatchMessage">
+		<wsdl:part name="parameters" element="wsdd:ResolveMatches"/>
+	</wsdl:message>
+	<wsdl:portType name="DiscoveryProxy" wse:EventSource="true">
+		<wsdl:operation name="HelloReport">
+			<wsdl:output message="dp:HelloMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"/>
+		</wsdl:operation>
+		<wsdl:operation name="ByeReport">
+			<wsdl:output message="dp:ByeMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"/>
+		</wsdl:operation>
+		<wsdl:operation name="Hello">
+			<wsdl:input message="dp:HelloMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"/>
+		</wsdl:operation>
+		<wsdl:operation name="Bye">
+			<wsdl:input message="dp:ByeMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"/>
+		</wsdl:operation>
+		<wsdl:operation name="Probe">
+			<wsdl:input message="dp:ProbeMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"/>
+			<wsdl:output message="dp:ProbeMatchMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches"/>
+		</wsdl:operation>
+		<wsdl:operation name="Resolve">
+			<wsdl:input message="dp:ResolveMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"/>
+			<wsdl:output message="dp:ResolveMatchMessage" wsam:Action="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ResolveMatches"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="DiscoveryProxyBinding" type="dp:DiscoveryProxy">
+		<s12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsp:Policy>
+			<dpws:Profile wsp:Optional="true"/>
+		</wsp:Policy>
+		<wsdl:operation name="HelloReport">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"/>
+			<wsdl:output>
+				<s12:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ByeReport">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"/>
+			<wsdl:output>
+				<s12:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="Hello">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"/>
+			<wsdl:input>
+				<s12:body use="literal"/>
+			</wsdl:input>
+		</wsdl:operation>
+		<wsdl:operation name="Bye">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"/>
+			<wsdl:input>
+				<s12:body use="literal"/>
+			</wsdl:input>
+		</wsdl:operation>
+		<wsdl:operation name="Probe">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"/>
+			<wsdl:input>
+				<s12:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<s12:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="Resolve">
+			<s12:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"/>
+			<wsdl:input>
+				<s12:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<s12:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+</wsdl:definitions>