[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "retry_deux" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Feb 15 18:05:59 CST 2012
branch "retry_deux" has been updated
via b416aee10a7fc5fd57bad1eeadcf2088eb4bee79 (commit)
from 1806dec2243e6d91ae54871fd6bd4a85ea04b5f8 (commit)
Summary of changes:
.../Core/Discovery/ServiceLocatorEventsIf.ice | 32 +++-
.../Core/Discovery/ServiceLocatorIf.ice | 25 ++-
slice/AsteriskSCF/Core/Routing/RoutingIf.ice | 67 ++++++---
slice/AsteriskSCF/Media/MediaExtractionIf.ice | 4 +-
slice/AsteriskSCF/Media/MediaIf.ice | 31 +++-
slice/AsteriskSCF/Media/MediaInjectionIf.ice | 2 +-
slice/AsteriskSCF/Media/NetworkIf.ice | 7 +-
slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice | 20 ++-
slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice | 13 +-
slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice | 12 +-
slice/AsteriskSCF/Presence/PresenceIf.ice | 6 +-
slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice | 21 ++-
slice/AsteriskSCF/SIP/SIPRegistrarIf.ice | 24 +++-
.../SessionCommunicationsExtensionPointsIf.ice | 84 +++++++++--
.../SessionCommunicationsIf.ice | 160 +++++++++++++------
.../SessionCommunications/TelephonyEventsIf.ice | 16 ++-
.../System/Component/ComponentServiceIf.ice | 38 ++++-
.../System/Component/ConfigurationIf.ice | 12 +-
slice/AsteriskSCF/System/Component/ReplicaIf.ice | 33 ++++-
slice/AsteriskSCF/System/Logger/LoggerIf.ice | 2 +-
slice/AsteriskSCF/System/NAT/NATTraversalIf.ice | 9 +-
21 files changed, 455 insertions(+), 163 deletions(-)
- Log -----------------------------------------------------------------
commit b416aee10a7fc5fd57bad1eeadcf2088eb4bee79
Author: Ken Hunt <ken.hunt at digium.com>
Date: Wed Feb 15 18:05:29 2012 -0600
Extended the OperationContext so that the "rules" for when to do so are simpler.
diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
index 6578c25..ef49389 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
@@ -16,6 +16,8 @@
#pragma once
+#include <AsteriskSCF/System/OperationsIf.ice>
+
module AsteriskSCF
{
@@ -38,44 +40,62 @@ module Discovery
/**
* Method which is called when a comparator is registered.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the comparator.
*/
- idempotent void comparisonRegistered(string guid);
+ idempotent void comparisonRegistered(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
/**
* Method which is called when a comparator is unregistered.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the comparator.
*/
- idempotent void comparisonUnregistered(string guid);
+ idempotent void comparisonUnregistered(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
/**
* Method which is called when a service is registered.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the service.
*/
- idempotent void serviceRegistered(string guid);
+ idempotent void serviceRegistered(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
/**
* Method which is called when a service is unregistered.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the service.
*/
- idempotent void serviceUnregistered(string guid);
+ idempotent void serviceUnregistered(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
/**
* Method which is called when a service is suspended.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the service.
*/
- idempotent void serviceSuspended(string guid);
+ idempotent void serviceSuspended(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
/**
* Method which is called when a service is unsuspended.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param guid The unique identifier of the service.
*/
- idempotent void serviceUnsuspended(string guid);
+ idempotent void serviceUnsuspended(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string guid);
};
}; /* end module Discovery */
diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 7e21cc5..358b96f 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -163,7 +163,7 @@ module V1
/**
* Method which adds supported discovery parameters to a registered service.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param params A concrete class containing parameters describing what is supported.
*
@@ -187,18 +187,18 @@ module V1
* Method which suspends this service from being considered when a locator request
* is performed.
*/
- idempotent void suspend();
+ idempotent void suspend(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* Method which unsuspends this service. Once this method is called the service will
* be able to found again when a locator request is performed.
*/
- idempotent void unsuspend();
+ idempotent void unsuspend(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* Method which unregisters this service from the service locator.
*/
- idempotent void unregister();
+ idempotent void unregister(AsteriskSCF::System::V1::OperationContext operationContext);
};
/**
@@ -248,7 +248,10 @@ module V1
*
* @return A proxy to the service management interface for this service.
*/
- idempotent ServiceManagement *addService(Object *service, string guid);
+ idempotent ServiceManagement *addService(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Object *service,
+ string guid);
/**
* Returns a list of all registered services.
@@ -265,13 +268,17 @@ module V1
/**
* Method which adds a comparator to the service locator.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param compareguid A unique identifier for this comparator.
- *
* @param compare A proxy to the comparator service.
*
* @throws DuplicateCompare if an existing comparator was found using the given guid.
*/
- idempotent void addCompare(string compareguid, ServiceLocatorParamsCompare *compare) throws DuplicateCompare;
+ idempotent void addCompare(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string compareguid,
+ ServiceLocatorParamsCompare *compare)
+ throws DuplicateCompare, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which removes a comparator from the service locator.
@@ -280,7 +287,9 @@ module V1
*
* @throws CompareNotFound if the given comparator could not be found.
*/
- idempotent void removeCompare(string compareguid) throws CompareNotFound;
+ idempotent void removeCompare(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string compareguid) throws CompareNotFound, AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Core/Routing/RoutingIf.ice b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
index 1af6c20..19384a9 100644
--- a/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
+++ b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
@@ -16,6 +16,7 @@
#pragma once
+#include <AsteriskSCF/System/OperationsIf.ice>
#include <AsteriskSCF/Core/Endpoint/EndpointIf.ice>
module AsteriskSCF
@@ -118,6 +119,8 @@ module V1
/**
* Method which registers an EndpointLocator that can provide endpoints.
*
+ * @param operationContext Provides unique context for each call to this operation.
+ *
* @param id A unique identifier for the added EndpointLocator.
*
* @param destinationIdRangeList A set of regular expressions that define the valid endpoint ids
@@ -129,23 +132,29 @@ module V1
*
* @throws InvalidParamsException if any parameters are invalid.
*/
- idempotent void addEndpointLocator(string id, RegExSeq destinationIdRangeList, EndpointLocator *locator)
- throws LocatorAlreadyRegisteredException, InvalidParamsException;
+ idempotent void addEndpointLocator(AsteriskSCF::System::V1::OperationContext operationContext,
+ string id, RegExSeq destinationIdRangeList, EndpointLocator *locator)
+ throws LocatorAlreadyRegisteredException, InvalidParamsException,
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which unregisters an EndpointLocator.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param id The unique id of the locator to remove.
*
* @throws DestinationNotFoundException if the EndpointLocator of the given id is not registered.
*/
- idempotent void removeEndpointLocator(string id) throws DestinationNotFoundException;
+ idempotent void removeEndpointLocator(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string id)
+ throws DestinationNotFoundException, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which modifies the range of device ids managed by a previously added EndpointLocator.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param id The unique identifier for the added EndpointLocator.
- *
* @param A list of reqular expressions that define the the valid endpoint ids. This
* set of regular expressions completely replaces the current set.
*
@@ -153,8 +162,10 @@ module V1
*
* @throws InvalidParamsException if any parameters are invalid.
*/
- idempotent void setEndpointLocatorDestinationIds(string id, RegExSeq deviceIdRangeList)
- throws DestinationNotFoundException, InvalidParamsException;
+ idempotent void setEndpointLocatorDestinationIds(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string id, RegExSeq deviceIdRangeList)
+ throws DestinationNotFoundException, InvalidParamsException, AsteriskSCF::System::V1::OperationCallCancelledException;
};
@@ -165,16 +176,21 @@ module V1
{
/**
* Method which informs routing to drop references to all EndpointLocators that have been registered.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void clearEndpointLocators();
+ idempotent void clearEndpointLocators(AsteriskSCF::System::V1::OperationContext operationContext)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which sends a policy string to the Lua script processor. The default implementation is a no-op,
* but site-specific scripts may make use it.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param policy A site-specific policy specification.
*/
- idempotent void setPolicy(string policy);
+ idempotent void setPolicy(AsteriskSCF::System::V1::OperationContext operationContext, string policy)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
};
module Event
@@ -201,55 +217,66 @@ module V1
/**
* Notification that a lookup was attempted.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param destinationId The destination being looked up.
- *
* @param result Indicates whether or not the attempt was successful.
*/
- idempotent void lookupEvent(string destinationId, OperationResult result);
+ idempotent void lookupEvent(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string destinationId, OperationResult result);
/**
* Notification that an attempt to add an EndpointLocator was made.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param id The identifier of the EndpointLocator being added.
- *
* @param destinationIdRangeList A set of regular expressions that define the endpoints available.
- *
* @param result Indicates whether or not the attempt was successful.
*/
- idempotent void addEndpointLocatorEvent(string id, RegExSeq destinationIdRangeList, EndpointLocator *locator, OperationResult result);
+ idempotent void addEndpointLocatorEvent(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string id, RegExSeq destinationIdRangeList, EndpointLocator *locator, OperationResult result);
/**
* Notification that an attempt was made to remove an EndpointLocator.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param id The identifier of the EndpointLocator being removed.
- *
* @param result Indicates whether or not the attempt was successful.
*/
- idempotent void removeEndpointLocatorEvent(string id, OperationResult result);
+ idempotent void removeEndpointLocatorEvent(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string id, OperationResult result);
/**
* Notification that an attempt was made to modify the range of destinationIds
* accessible from a given EndpointLocator.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param id The destination being looked up.
- *
* @param destinationIdRangeList A list of regular expressions to be representative of the new valid ids.
- *
* @param result Indicates whether or not the attempt was successful.
*/
- idempotent void setEndpointLocatorDestinationIdsEvent(string id, RegExSeq destinationIdRangeList, OperationResult result);
+ idempotent void setEndpointLocatorDestinationIdsEvent(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string id, RegExSeq destinationIdRangeList, OperationResult result);
/**
* Called when the EndpointLocator cache has been cleared by an administrative action.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
*/
- void clearEndpointLocatorsEvent();
+ void clearEndpointLocatorsEvent(AsteriskSCF::System::V1::OperationContext operationContext);
/**
* Called when an administration operation has set the routing service policy.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param policy The new policy.
*/
- idempotent void setPolicyEvent(string policy);
+ idempotent void setPolicyEvent(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string policy);
};
};
diff --git a/slice/AsteriskSCF/Media/MediaExtractionIf.ice b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
index d59ac12..9df60e6 100644
--- a/slice/AsteriskSCF/Media/MediaExtractionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaExtractionIf.ice
@@ -109,7 +109,7 @@ module V1
/**
* Method used to request that media extraction occurs.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param requests The media extraction requests.
*
* @return ExtractInstanceDict A dictionary of media extraction instances.
@@ -122,7 +122,7 @@ module V1
/**
* Method used to request that media extraction stop.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param instances The media extraction instances that should stop.
*/
void stopExtraction(
diff --git a/slice/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
index 96d8b11..f56185c 100644
--- a/slice/AsteriskSCF/Media/MediaIf.ice
+++ b/slice/AsteriskSCF/Media/MediaIf.ice
@@ -137,7 +137,7 @@ module V1
/**
* Method used to establish direct media connections external to Asterisk SCF.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param connections The direct connections that are to be established.
*/
["amd"] idempotent void connectStreams(
@@ -148,7 +148,7 @@ module V1
/**
* Method used to tear down direct media connections.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param streams A sequence of streams that should no longer be directly connected.
*/
["amd"] idempotent void disconnectStreams(
@@ -263,7 +263,10 @@ module V1
* @note There can only be one cookie of a given type associated
* with a session.
*/
- idempotent void setCookies(SessionCookies cookies);
+ idempotent void setCookies(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove cookies from the session.
@@ -273,7 +276,10 @@ module V1
* Only the concrete type of each cookie passed in is used to
* determine which cookies to remove.
*/
- idempotent void removeCookies(SessionCookies cookies);
+ idempotent void removeCookies(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Get cookies stored on the session.
@@ -313,14 +319,20 @@ module V1
*
* @param destination A proxy to a stream sink where media will be sent to.
*/
- idempotent void addSink(StreamSink* destination);
+ idempotent void addSink(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ StreamSink* destination) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which removes a sink. Once removed media will no longer be written to it.
*
* @param destination A proxy to the stream sink to be removed.
*/
- idempotent void removeSink(StreamSink* destination);
+ idempotent void removeSink(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ StreamSink* destination) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which retrieves the current stream sinks for media.
@@ -346,7 +358,7 @@ module V1
/**
* Method which requests that the source change the format of frames being sent to ALL sinks.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param Format A concrete class describing the format to change to.
*
* @throws MediaFormatSwitchException if the source could not be switched to the requested format.
@@ -382,7 +394,10 @@ module V1
*
* @param source A proxy to the stream source that media is being received from.
*/
- idempotent void setSource(StreamSource* source);
+ idempotent void setSource(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ StreamSource* source) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which retrieves the current stream source of media.
diff --git a/slice/AsteriskSCF/Media/MediaInjectionIf.ice b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
index 7ecba6c..adb4a33 100644
--- a/slice/AsteriskSCF/Media/MediaInjectionIf.ice
+++ b/slice/AsteriskSCF/Media/MediaInjectionIf.ice
@@ -108,7 +108,7 @@ module V1
/**
* Method used to request that media injection occurs.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param requests The media injection requests.
*
* @return InjectInstanceDict A dictionary of media injection instances.
diff --git a/slice/AsteriskSCF/Media/NetworkIf.ice b/slice/AsteriskSCF/Media/NetworkIf.ice
index 65d686d..433ad67 100644
--- a/slice/AsteriskSCF/Media/NetworkIf.ice
+++ b/slice/AsteriskSCF/Media/NetworkIf.ice
@@ -16,6 +16,8 @@
#pragma once
+#include <AsteriskSCF/System/OperationsIf.ice>
+
module AsteriskSCF
{
@@ -80,7 +82,10 @@ module V1
*
* @throws InvalidAddress when the address passed in is invalid.
*/
- idempotent void setRemoteDetails(string address, int port) throws InvalidAddress;
+ idempotent void setRemoteDetails(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string address, int port) throws
+ InvalidAddress, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which returns the remote address information that we are sending to.
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
index d0800f1..13de541 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTCPIf.ice
@@ -128,7 +128,7 @@ module V1
*
* Note that this must be called before RTCP will be sent.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param address A string representation of the address.
*
@@ -152,7 +152,7 @@ module V1
/**
* Method called when statistics information is updated for a source
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param source The source the statistics were updated on
*
@@ -167,7 +167,7 @@ module V1
/**
* Method called when statistics information is updated for a sink
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param sink The sink the statistics were updated on
*
@@ -182,7 +182,7 @@ module V1
/**
* Method called when the SSRC changes for a source
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param source The source that the SSRC has changed on
*
@@ -220,16 +220,24 @@ module V1
/**
* Method used to add a listener which receives statistics information at the RTCP interval
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param listener A proxy to the listener to add
*/
- idempotent void addListener(InformationListener *listener);
+ idempotent void addListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ InformationListener *listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method used to remove a listener
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param listener A proxy to the listener to move
*/
- idempotent void removeListener(InformationListener *listener);
+ idempotent void removeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ InformationListener *listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* end module V1 */
diff --git a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
index cac171c..95fc291 100644
--- a/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
+++ b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
@@ -125,7 +125,10 @@ module V1
*
* @throws InvalidAddress when the address passed in is invalid.
*/
- idempotent void setRemoteDetails(string address, int port) throws InvalidAddress;
+ idempotent void setRemoteDetails(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string address, int port) throws
+ InvalidAddress, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which retrieves the remote IP address.
@@ -155,7 +158,7 @@ module V1
/**
* Method which associates payloads and media formats.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param mappings The payload and media format mappings.
*/
void associatePayloads(
@@ -223,7 +226,7 @@ module V1
*
* Set the key information for the local endpoint.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param suiteName The type of crypto suite to be used.
*
@@ -248,7 +251,7 @@ module V1
/**
* Set the key information and initiates communication with peer.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param suiteName The type of crypto suite to be used.
*
@@ -292,7 +295,7 @@ module V1
/**
* Method which creates a new RTP session and returns a proxy to it.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param params Parameters to configure the RTP session with.
*
diff --git a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
index fd3ffd6..77021b9 100644
--- a/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
+++ b/slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
@@ -115,7 +115,10 @@ module V1
*
* @param datagramSize Maximum datagram size.
*/
- idempotent void setFarMaxDatagram(int datagramSize);
+ idempotent void setFarMaxDatagram(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ int datagramSize) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which returns the maximum datagram size of this source.
@@ -136,7 +139,10 @@ module V1
*
* @param ErrorCorrectionScheme The error correction scheme to use.
*/
- idempotent void setErrorCorrectionScheme(ErrorCorrectionScheme scheme);
+ idempotent void setErrorCorrectionScheme(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ErrorCorrectionScheme scheme) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which gets the error correction scheme.
@@ -174,7 +180,7 @@ module V1
/**
* Method which creates a new UDPTL session and returns a proxy to it.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param params Parameters to configure the UDPTL session with.
*
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
index 1078678..0b9ec0e 100644
--- a/slice/AsteriskSCF/Presence/PresenceIf.ice
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -131,7 +131,7 @@ module V1
/**
* Method used to indicate that an resource has updated its status.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param resource Name of the resource that the status is for.
*
@@ -187,7 +187,7 @@ module V1
*
* Note that the current status for each resource will be sent to the consumer before returning.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param authToken Authentication token received when authenticate was called.
*
@@ -207,7 +207,7 @@ module V1
/**
* Method used to unsubscribe from specific resource status updates.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param resources A sequence of resources that will no longer be subscribed to.
*
diff --git a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
index 974ecb0..8aa512b 100644
--- a/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
@@ -18,6 +18,7 @@
#include <Ice/BuiltinSequences.ice>
+#include <AsteriskSCF/System/OperationsIf.ice>
#include <AsteriskSCF/System/Hook/HookIf.ice>
module AsteriskSCF
@@ -191,7 +192,8 @@ module V1
* authentication challenge (i.e. WWW-Authenticate header) that Asterisk
* SCF will send to the UAC
*/
- AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+ idempotent AsteriskSCF::System::Hook::V1::HookResult challengeRequest(RequestInfo info, out DigestChallengeSeq challenges);
+
/**
* Called when Asterisk SCF is a UAC. This is used to formulate the
* authentication response (i.e. Authorization header) that Asterisk
@@ -224,9 +226,20 @@ module V1
interface AuthExtensionPoint
{
- idempotent void addAuthHook(AuthHook *hook, int priority, RequestTypeSeq requestTypes);
- idempotent void removeAuthHook(AuthHook *hook);
- idempotent void clearAuthHooks();
+ idempotent void addAuthHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ AuthHook *hook,
+ int priority,
+ RequestTypeSeq requestTypes) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
+ idempotent void removeAuthHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ AuthHook *hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
+ idempotent void clearAuthHooks(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
index 0cfd3f9..9400c62 100644
--- a/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
+++ b/slice/AsteriskSCF/SIP/SIPRegistrarIf.ice
@@ -17,6 +17,7 @@
#pragma once
#include <Ice/BuiltinSequences.ice>
+#include <AsteriskSCF/System/OperationsIf.ice>
module AsteriskSCF
{
@@ -85,7 +86,11 @@ interface RegistrarListener
* @param contacts The added contacts.
*
*/
- idempotent void contactsAdded(BindingUpdateSeq contacts);
+ idempotent void contactsAdded(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BindingUpdateSeq contacts) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Alerts the listener that contacts have been removed.
* There is no specific call for indicating that an AoR
@@ -93,7 +98,10 @@ interface RegistrarListener
* method has been called, listeners should take
* appropriate action if the AoR has no bound contacts.
*/
- idempotent void contactsRemoved(BindingUpdateSeq contacts);
+ idempotent void contactsRemoved(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BindingUpdateSeq contacts) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
/**
@@ -109,11 +117,19 @@ interface Registrar
* The return value is the map of all AoRs and their
* bindings.
*/
- ["amd"] idempotent ContactDict addListener(RegistrarListener *listener);
+ ["amd"] idempotent ContactDict addListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ RegistrarListener *listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Remove a listener.
*/
- ["amd"] idempotent void removeListener(RegistrarListener *listener);
+ ["amd"] idempotent void removeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ RegistrarListener *listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Get the mapping of all active registrations.
*/
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
index 5865792..971de34 100755
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
@@ -56,11 +56,13 @@ module V1
* session proxy so that all session methods may be hooked into. The hook may
* instead modify the session by adding or removing cookies.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param originalData Data that the session gateway has for the session
* @param[out] replacementData Modified data for the session
* @return A HookResult indicating whether the hook was successful
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult modifySession(
+ AsteriskSCF::System::V1::OperationContext operationContext,
SessionCreationHookData originalData,
out SessionCreationHookData replacementData);
};
@@ -72,15 +74,25 @@ module V1
/**
* Add a new session decorator hook
*/
- idempotent void addSessionCreationHook(SessionCreationHook* hook);
+ idempotent void addSessionCreationHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCreationHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Remove a session decorator hook
*/
- idempotent void removeSessionCreationHook(SessionCreationHook* hook);
+ idempotent void removeSessionCreationHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCreationHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Remove all session decorator hooks
*/
- idempotent void clearSessionCreationHooks();
+ idempotent void clearSessionCreationHooks(
+ AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
const string BridgeCreationExtensionPointCategory = "BridgeCreationHook";
@@ -120,6 +132,7 @@ module V1
* Interpose some operations when creating bridge objects.
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult execute(
+ AsteriskSCF::System::V1::OperationContext operationContext,
BridgeCreationHookData originalData,
out BridgeCreationHookData alteredData);
};
@@ -132,17 +145,24 @@ module V1
* Add a new bridge creation hook. Matches on ID and refreshes the proxy if an object with
* that ID has already been added.
*/
- idempotent void addHook(BridgeCreationHook* hook);
+ idempotent void addHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeCreationHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove the bridge creation hook that matches the proxy provided.
*/
- idempotent void removeHook(BridgeCreationHook* hook);
+ idempotent void removeHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeCreationHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Clear all registered hooks.
*/
- idempotent void clearHooks();
+ idempotent void clearHooks(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
const string PartyIdentificationHookLocatorCategory = "PartyIdHook";
@@ -159,12 +179,14 @@ module V1
* to the hook. This hook is expected to return the original ConnectedLine record
* or an updated version of it.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param sendingSession The session that has sent ConnectedLine information.
* @param receivedConnectedLineUpdate The data received from the sending session.
* @param[out] replacementConnectedLineUpdate Modified data to be used
* @return A HookResult indicating whether the hook was successful
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult modifyReceivedConnectedLine(
+ AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::SessionCommunications::V1::Session *sendingSession,
AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine receivedConnectedLineUpdate,
out AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine replacementConnectedLineUpdate);
@@ -185,6 +207,7 @@ module V1
* This hook is expected to return the original ConnectedLine record
* or an updated version of it.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param sendingSession The session that has sent ConnectedLine information.
* @param destinationSession The session that will receive the ConnectedLine information.
* @param[out] receivedConnectedLine The data received from the sending session.
@@ -192,6 +215,7 @@ module V1
* @return A HookResult indicating whether the hook was successful
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult modifyForwardingConnectedLine(
+ AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::SessionCommunications::V1::Session *sendingSession,
AsteriskSCF::SessionCommunications::V1::Session *destinationSession,
AsteriskSCF::SessionCommunications::PartyIdentification::V1::ConnectedLine receivedConnectedLine,
@@ -213,6 +237,7 @@ module V1
* This hook is expected to return the original ConnectedLine record
* or an updated version of it.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param sendingSession The session that has sent ConnectedLine information.
* @param destinationSession The session that will receive the ConnectedLine information.
* @param[out] receivedConnectedLine The data received from the sending session.
@@ -220,6 +245,7 @@ module V1
* @return A HookResult indicating whether the hook was successful
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult modifyForwardingCaller(
+ AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::SessionCommunications::V1::Session *sendingSession,
AsteriskSCF::SessionCommunications::V1::Session *destinationSession,
AsteriskSCF::SessionCommunications::PartyIdentification::V1::Caller receivedCaller,
@@ -242,6 +268,7 @@ module V1
* This hook is expected to return the original Redirections record
* or an updated version of it.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param sendingSession The session that has sent Redirections information.
* @param destinationSession The session that will receive the Redirections information.
* @param[out] receivedRedirections The data received from the sending session.
@@ -249,6 +276,7 @@ module V1
* @return A HookResult indicating whether the hook was successful
*/
idempotent AsteriskSCF::System::Hook::V1::HookResult modifyForwardingRedirections(
+ AsteriskSCF::System::V1::OperationContext operationContext,
AsteriskSCF::SessionCommunications::V1::Session *sendingSession,
AsteriskSCF::SessionCommunications::V1::Session *destinationSession,
AsteriskSCF::SessionCommunications::PartyIdentification::V1::Redirections receivedRedirections,
@@ -261,47 +289,73 @@ module V1
/**
* Add a hook for received ConnectedLine party id.
*/
- idempotent void addReceivedConnectedLinePartyIdHook(ReceivedConnectedLinePartyIdHook* hook);
+ idempotent void addReceivedConnectedLinePartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ReceivedConnectedLinePartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Add a hook to invoke when forwarding ConnectedLine party id.
*/
- idempotent void addForwardingConnectedLinePartyIdHook(ForwardingConnectedLinePartyIdHook* hook);
+ idempotent void addForwardingConnectedLinePartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingConnectedLinePartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Add a hook to invoke when forwarding ConnectedLine party id.
*/
- idempotent void addForwardingCallerPartyIdHook(ForwardingCallerPartyIdHook* hook);
+ idempotent void addForwardingCallerPartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingCallerPartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Add a hook to invoke when forwarding Redirections party id record.
*/
- idempotent void addForwardingRedirectionsPartyIdHook(ForwardingRedirectionsPartyIdHook* hook);
+ idempotent void addForwardingRedirectionsPartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingRedirectionsPartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove a received ConnectedLine hook
*/
- idempotent void removeReceivedConnectedLinePartyIdHook(ReceivedConnectedLinePartyIdHook* hook);
+ idempotent void removeReceivedConnectedLinePartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ReceivedConnectedLinePartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove a forwarding ConnectedLine hook
*/
- idempotent void removeForwardingConnectedLinePartyIdHook(ForwardingConnectedLinePartyIdHook* hook);
+ idempotent void removeForwardingConnectedLinePartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingConnectedLinePartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove a forwarding ConnectedLine hook
*/
- idempotent void removeForwardingCallerPartyIdHook(ForwardingCallerPartyIdHook* hook);
+ idempotent void removeForwardingCallerPartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingCallerPartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove a forwarding Redirections hook
*/
- idempotent void removeForwardingRedirectionsPartyIdHook(ForwardingRedirectionsPartyIdHook* hook);
+ idempotent void removeForwardingRedirectionsPartyIdHook(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ForwardingRedirectionsPartyIdHook* hook) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Remove all party identification hooks
*/
- idempotent void clearPartyIdentificationHooks();
+ idempotent void clearPartyIdentificationHooks(
+ AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* End of module V1 */
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index e1019e8..3f2b1be 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -300,7 +300,7 @@ module V1
/**
* Notification that some indication event has occurred on the session.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param source The session the event occurred on.
*
@@ -351,7 +351,7 @@ module V1
/**
* Method called to change the state of streams.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param streams A dictionary of streams and their new state.
*/
@@ -363,7 +363,7 @@ module V1
/**
* Method called to add streams.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param streams A dictionary of streams with state and requested formats.
*
@@ -372,14 +372,13 @@ module V1
*/
["amd"] idempotent AsteriskSCF::Media::V1::StreamInformationDict addStreams(
AsteriskSCF::System::V1::OperationContext operationContext,
- AsteriskSCF::Media::V1::StreamInformationDict
- streams) throws
+ AsteriskSCF::Media::V1::StreamInformationDict streams) throws
AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method called to remove streams.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param streams A dictionary of streams to remove.
*/
@@ -391,7 +390,7 @@ module V1
/**
* Method which updates connected line party identification.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param connectedLine Connected line party information.
*
@@ -405,7 +404,7 @@ module V1
/**
* Method which updates caller party identification.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param connectedLine Caller party information.
*
@@ -419,7 +418,7 @@ module V1
/**
* Method which provides notification of redirections that have occurred.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param redirections Redirections that have occurred
*
@@ -454,12 +453,14 @@ module V1
*
* @see SessionInfo
*/
- ["amd"] idempotent SessionInfo addListener(SessionListener* listener);
+ ["amd"] idempotent SessionInfo addListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionListener* listener);
/**
* Set (or replace) cookies on the session.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param cookies A sequence of one or more concrete objects,
* each of which are of a type derived from SessionCookie.
@@ -478,7 +479,7 @@ module V1
/**
* Remove cookies from the session.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param cookies A sequence of one or more concrete objects,
* each of which are of a type derived from SessionCookie.
@@ -506,7 +507,7 @@ module V1
/**
* Request that an indication be performed on a session.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param event The indication event to perform.
*
@@ -563,12 +564,16 @@ module V1
*
* @param listener A proxy to the listener to the remove.
*/
- idempotent void removeListener(SessionListener* listener);
+ idempotent void removeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Start a session dialogue with a peer.
*/
- idempotent void start();
+ idempotent void start(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* End the dialogue with the peer, sending the
@@ -576,7 +581,10 @@ module V1
*
* @param response Code identifying the reason the dialog stopped.
*/
- idempotent void stop(ResponseCode response);
+ idempotent void stop(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ResponseCode response) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Gets the bridge object this Session is associated with.
@@ -596,7 +604,10 @@ module V1
*
* @return A current copy of the session information.
*/
- ["amd"] idempotent SessionInfo setBridge(Bridge* newBridge, SessionListener* listener);
+ ["amd"] idempotent SessionInfo setBridge(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Bridge* newBridge,
+ SessionListener* listener);
/**
* Removes this Session from it's associated Bridge.
@@ -605,7 +616,10 @@ module V1
*
* @throws NotBridged if the session is not currently in a bridge.
*/
- ["amd"] idempotent void removeBridge(SessionListener* listener) throws NotBridged;
+ ["amd"] idempotent void removeBridge(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionListener* listener) throws
+ NotBridged, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which sets the session controller proxy to be contacted when actions
@@ -620,7 +634,7 @@ module V1
* the session so it can also perform controller intervention and receive
* notification from the component that passed in the SessionController.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param controller A proxy to the SessionController object implemented by the caller.
*
@@ -645,7 +659,10 @@ module V1
*
* @param controller A proxy to the session controller to remove.
*/
- ["amd"] idempotent void removeSessionController(SessionController* controller);
+ ["amd"] idempotent void removeSessionController(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionController* controller) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method which retrieves caller party identification information
@@ -792,7 +809,7 @@ module V1
* Attempts to establish an end-to-end communication between an
* existing session and destination identified by an address or ID.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param source The initiating session.
*
@@ -826,7 +843,7 @@ module V1
* session routable by the destination param.
* The session specified may optionally be replaced.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param sessionToReplace The session whose bridged sessions are connected
* with a newly created session. The bridge object is obtained from the accessor on this
@@ -866,7 +883,7 @@ module V1
* No routing is actually performed. This operation exists here for consistency,
* since connectBridgedSessionsWithDestination(...) is implemented by this interface.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param sessionToReplace The session that is to be replaced in a
* bridge. The bridge obejct associated with this session will survive, and
@@ -909,7 +926,7 @@ module V1
* a SessionListener object for notification of changes to the session and also
* optionally specifying the streams that should be present on the session.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param destination A stringified identifier or address for the destination.
*
@@ -940,28 +957,40 @@ module V1
* any sessions created henceforth, until the default listener
* is removed.
*/
- idempotent void addDefaultSessionListener(SessionListener* listener);
+ idempotent void addDefaultSessionListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Removes a default SessionListener. Doesn't remove the
* the listener from any existing sessions, but rather
* stops adding the listener to future sessions.
*/
- idempotent void removeDefaultSessionListener(SessionListener* listener);
+ idempotent void removeDefaultSessionListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Adds default SessionCookies for sessions created for this endpoint.
* Does not alter any existing sessions, but any sessions created
* henceforth will have these cookies set.
*/
- idempotent void addDefaultSessionCookies(SessionCookies cookies);
+ idempotent void addDefaultSessionCookies(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Removes a set of default SessionCookies for sessions created for this endpoint.
* Doesn't remove cookies from any existing sessions, but new
* sessions for this endpoint will not have these cookies set.
*/
- idempotent void removeDefaultSessionCookies(SessionCookies cookies);
+ idempotent void removeDefaultSessionCookies(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ SessionCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
/**
@@ -1085,7 +1114,8 @@ module V1
* Abruptly destroy the bridge. Sessions will not be stopped. Calls subsequent to the initial call will either
* be ignored or an ObjectNotExistException will be thrown.
*/
- idempotent void destroy();
+ idempotent void destroy(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* List the sessions currently on the bridge.
@@ -1123,7 +1153,8 @@ module V1
* repeat.
*
*/
- idempotent void shutdown();
+ idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Adds a listener object to the bridge. The listener will receive notification of future changes to the bridge
@@ -1298,7 +1329,10 @@ module V1
*
* @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- idempotent void stopped(Bridge* sessionBridge, BridgeCookies cookies);
+ idempotent void stopped(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Bridge* sessionBridge, BridgeCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Called when a bridge has started shutdown/destruction operations.
@@ -1307,7 +1341,11 @@ module V1
*
* @param cookies A sequence of bridge cookies that are associated with the bridge.
*/
- idempotent void stopping(Bridge* sessionBridge, BridgeCookies cookies);
+ idempotent void stopping(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Bridge* sessionBridge,
+ BridgeCookies cookies) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
sequence<BridgeListener*> BridgeListenerSeq;
@@ -1332,7 +1370,10 @@ module V1
*
* @param listener A proxy to the bridge manager listener to add.
*/
- idempotent void addListener(BridgeManagerListener* listener);
+ idempotent void addListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeManagerListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method called to create a bridge.
@@ -1366,7 +1407,10 @@ module V1
*
* @param listener A proxy to the bridge manager listener to remove.
*/
- idempotent void removeListener(BridgeManagerListener* listener);
+ idempotent void removeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeManagerListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method called to add a listener to the list of bridge listeners that
@@ -1377,8 +1421,11 @@ module V1
* @throws NullProxyException if the listener proxy is a null proxy.
*
*/
- idempotent void addDefaultBridgeListener(BridgeListener* listener)
- throws AsteriskSCF::System::V1::NullProxyException;
+ idempotent void addDefaultBridgeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeListener* listener) throws
+ AsteriskSCF::System::V1::NullProxyException,
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method called to remove a listener to the list of bridge listeners that
@@ -1389,8 +1436,11 @@ module V1
* @throws NullProxyException if the listener proxy is a null proxy.
*
*/
- idempotent void removeDefaultBridgeListener(BridgeListener* listener)
- throws AsteriskSCF::System::V1::NullProxyException;
+ idempotent void removeDefaultBridgeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeListener* listener) throws
+ AsteriskSCF::System::V1::NullProxyException,
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Method called to get a list of bridges currently active in the bridge manager.
@@ -1408,7 +1458,8 @@ module V1
* repeat.
*
*/
- idempotent void shutdown();
+ idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
/**
@@ -1423,21 +1474,31 @@ module V1
*
* @param newBridge A proxy to the newly created bridge.
*/
- idempotent void bridgeCreated(BridgeManager* manager, Bridge* newBridge);
+ idempotent void bridgeCreated(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeManager* manager,
+ Bridge* newBridge) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Notice that a bridge manager has stopped.
*
* @param manager The bridge manager that has stopped.
*/
- idempotent void stopped(BridgeManager* manager);
+ idempotent void stopped(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeManager* manager) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Notice that a bridge manager is stopping.
*
* @param manager The bridge manager that is stopping.
*/
- idempotent void stopping(BridgeManager* manager);
+ idempotent void stopping(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ BridgeManager* manager) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
module Event
@@ -1464,7 +1525,7 @@ module V1
/**
* Notice that routeSession operation was called.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param source The initiating session.
*
@@ -1476,13 +1537,12 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Session* source,
string destination,
- OperationResult result) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ OperationResult result);
/**
* Notice that connectBridgedSessionsWithDestinationEvent operation was called.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param sessionToReplace The session that is to be replaced in the
* bridge. The bridge obejct is obtained from the accessor on this
@@ -1496,13 +1556,12 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Session* sessionToReplace,
string destination,
- OperationResult result) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ OperationResult result);
/**
* Notice that connectBridgedSessionsEvent operation was called.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
*
* @param sessionToReplace The session that is to be replaced in the
* bridge. The bridge obejct is obtained from the accessor on this
@@ -1518,8 +1577,7 @@ module V1
AsteriskSCF::System::V1::OperationContext operationContext,
Session* sessionToReplace,
Session* bridgedSession,
- OperationResult result) throws
- AsteriskSCF::System::V1::OperationCallCancelledException;
+ OperationResult result);
};
}; /* End of module Event */
diff --git a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
index 3866bea..2df4b44 100644
--- a/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/TelephonyEventsIf.ice
@@ -103,8 +103,7 @@ module V1
/**
* Add sinks to send telephony events to.
*
- * @param operationContext Provides unique id for this operation.
- *
+ * @param operationContext Provides unique context for each call to this operation.
* @param sinks The sinks to add.
*/
["amd"] idempotent void addSinks(
@@ -140,19 +139,24 @@ module V1
/**
* Send a telephony event to this sink.
*
- * @param operationContext Provides unique id for this operation.
- *
+ * @param operationContext Provides unique context for each call to this operation.
* @param event
*/
["amd"] idempotent void write(
AsteriskSCF::System::V1::OperationContext operationContext,
TelephonyEvent event)
- throws TelephonyEventException;
+ throws TelephonyEventException, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Set the source for this sink
+ * @param operationContext Provides unique context for each call to this operation.
+ * @param source
*/
- ["amd"] idempotent void setSource(TelephonyEventSource* source);
+ ["amd"] idempotent void setSource(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ TelephonyEventSource* source)
+ throws TelephonyEventException, AsteriskSCF::System::V1::OperationCallCancelledException;
+
/**
* Get the source for this sink
*/
diff --git a/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
index fb4b4b0..132e732 100644
--- a/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
+++ b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
@@ -16,6 +16,8 @@
#pragma once
+#include <AsteriskSCF/System/OperationsIf.ice>
+
module AsteriskSCF
{
@@ -58,7 +60,8 @@ module V1
*
* @throws ShuttingDown if the service is in the process of shutting down.
*/
- idempotent void suspend() throws ShuttingDown;
+ idempotent void suspend(AsteriskSCF::System::V1::OperationContext operationContext)
+ throws ShuttingDown, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Resumes a service that has been suspended. After this call returns the suspended service
@@ -67,7 +70,8 @@ module V1
*
* @throws ShuttingDown if the service is in the process of shutting down.
*/
- idempotent void resume() throws ShuttingDown;
+ idempotent void resume(AsteriskSCF::System::V1::OperationContext operationContext)
+ throws ShuttingDown, AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Commences a clean shutdown of the services. The details of shutdown are implementation specific.
@@ -77,7 +81,8 @@ module V1
*
* @throws Suspended if the service is suspended.
*/
- idempotent void shutdown() throws Suspended;
+ idempotent void shutdown(AsteriskSCF::System::V1::OperationContext operation)
+ throws Suspended, AsteriskSCF::System::V1::OperationCallCancelledException;
};
/**
@@ -96,18 +101,37 @@ module V1
/**
* Set a test mode. The meaning of the mode is specific
* to a given component and it's tests.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void setTestMode(string mode);
+ idempotent void setTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Set a test mode with params. The meaning of the mode and paramters is specific
* to a given component and it's tests.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void setTestModeWithArgs(string mode, ComponentTestParamSeq params);
+ idempotent void setTestModeWithArgs(AsteriskSCF::System::V1::OperationContext operationContext, string mode, ComponentTestParamSeq params)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
- idempotent void clearTestMode(string mode);
+ /**
+ * Clears a test mode with the give mode id.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
+ * @param mode Test mode identifier. Meaning is component-specific.
+ */
+ idempotent void clearTestMode(AsteriskSCF::System::V1::OperationContext operationContext, string mode)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
- idempotent void clearTestModes();
+ /**
+ * Clears all test modes previously set.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
+ */
+ idempotent void clearTestModes(AsteriskSCF::System::V1::OperationContext operationContext)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* End of V1 */
diff --git a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
index e6d610f..9be2dfb 100644
--- a/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
+++ b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
@@ -153,7 +153,7 @@ module V1
/**
* Update the configuration of one or more configuration groups.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param groups The groups and configuration items to update (or add).
*
* @throws SerialConflict when serial number of a configuration item is out of date.
@@ -167,7 +167,7 @@ module V1
/**
* Remove specific configuration items from a configuration group.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param groups The groups or configuration items to remove.
*
*/
@@ -179,7 +179,7 @@ module V1
/**
* Remove a configuration group and all configuration items.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param groups The groups or configuration items to remove.
*
*/
@@ -203,9 +203,13 @@ module V1
/**
* Add a listener that will receive configuration updates.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param service A proxy to the listener.
*/
- idempotent void registerConfigurationService(AsteriskSCF::System::Configuration::V1::ConfigurationService *service);
+ idempotent void registerConfigurationService(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ AsteriskSCF::System::Configuration::V1::ConfigurationService *service)
+ throws AsteriskSCF::System::V1::OperationCallCancelledException;
};
}; /* End of namespace V1 */
diff --git a/slice/AsteriskSCF/System/Component/ReplicaIf.ice b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
index 5a9c739..74a028c 100644
--- a/slice/AsteriskSCF/System/Component/ReplicaIf.ice
+++ b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
@@ -57,32 +57,45 @@ module V1
* tells the replica object to transition from standby to active mode.
* Calling activate on a replica that is already active should have no effect.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @return true if activated, false if failed to activate.
*/
- idempotent bool activate();
+ idempotent bool activate(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* standby tells the replica object to transition from active to standby mode.
* Calling standby on a replica that is already in standby mode should have
* no effect.
+ *
+ * @param operationContext Provides unique context for each call to this operation.
*/
- idempotent void standby();
+ idempotent void standby(AsteriskSCF::System::V1::OperationContext operationContext) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* addListener adds a ReplicaListener object that will receive notifications
* if the status of a replica changes.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param listener The ReplicaListener object to be added.
*/
- idempotent void addListener(ReplicaListener* listener);
+ idempotent void addListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ReplicaListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* removeListener removes a ReplicaListener object from the list of listeners
* receiving notificiatons of changes to the status of a replica.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param listener The ReplicaListener object to be removed.
*/
- idempotent void removeListener(ReplicaListener* listener);
+ idempotent void removeListener(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ ReplicaListener* listener) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
};
/**
@@ -96,16 +109,24 @@ module V1
/**
* Called when a replica has moved from standby to active state.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param source The replica under transition.
*/
- idempotent void activated(Replica* source);
+ idempotent void activated(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Replica* source) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* Called when a replica has moved from active to standby state.
*
+ * @param operationContext Provides unique context for each call to this operation.
* @param source The replica under transition.
*/
- idempotent void onStandby(Replica* source);
+ idempotent void onStandby(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ Replica* source) throws
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
* A replica may periodically notify listeners of its state.
diff --git a/slice/AsteriskSCF/System/Logger/LoggerIf.ice b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
index 04cac98..39c45b5 100644
--- a/slice/AsteriskSCF/System/Logger/LoggerIf.ice
+++ b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
@@ -150,7 +150,7 @@ module Logging
/**
* Notification of a new configuration.
*
- * @param operationContext Provides unique id for this operation.
+ * @param operationContext Provides unique context for each call to this operation.
* @param logConfiguration The new configuration.
*/
idempotent void configured(
diff --git a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
index 7b39984..e5c7242 100644
--- a/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
+++ b/slice/AsteriskSCF/System/NAT/NATTraversalIf.ice
@@ -16,6 +16,8 @@
#pragma once
+#include <AsteriskSCF/System/OperationsIf.ice>
+
module AsteriskSCF
{
module System
@@ -371,12 +373,15 @@ interface InteractiveConnectionAgent
* @throws NegotiationError if the negotation fails (includes error message).
*
**/
- ["amd"] idempotent Candidate negotiate(string hostname, int port, CandidateSeq proposedCandidates) throws
+ ["amd"] idempotent Candidate negotiate(
+ AsteriskSCF::System::V1::OperationContext operationContext,
+ string hostname, int port, CandidateSeq proposedCandidates) throws
UnsupportedCandidate,
NegotiationNotSupported,
NegotiationInterrupted,
NegotiationError,
- NoValidCandidates;
+ NoValidCandidates,
+ AsteriskSCF::System::V1::OperationCallCancelledException;
/**
*
* Return a list of Candidates for the current agent.
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list