[asterisk-scf-commits] asterisk-scf/release/routing.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Aug 18 12:35:29 CDT 2011
branch "master" has been updated
via 0fccd642fced2875e655ed443af8dd04a553d247 (commit)
via 05cb193b2ed546de7013c28b01610fa64a5a2f39 (commit)
from 5e024c9a91e66d142645f2e108fb7309e4c3f7bd (commit)
Summary of changes:
.../BasicRoutingStateReplicationIf.ice | 2 +
...nectBridgedSessionsWithDestinationOperation.cpp | 8 ++++-
...onnectBridgedSessionsWithDestinationOperation.h | 3 ++
src/RouteSessionOperation.cpp | 9 ++++-
src/RouteSessionOperation.h | 3 ++
src/SessionRouter.cpp | 4 ++
src/SessionRouter.h | 2 +
src/SessionRouterOperation.cpp | 3 +-
src/SessionRouterOperation.h | 1 +
test/MockSessionEndpoint.cpp | 7 ++++-
test/MockSessionEndpoint.h | 6 +++-
test/TestRouting.cpp | 32 ++++++++++----------
12 files changed, 57 insertions(+), 23 deletions(-)
- Log -----------------------------------------------------------------
commit 0fccd642fced2875e655ed443af8dd04a553d247
Merge: 05cb193 5e024c9
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Aug 18 12:36:07 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/routing
commit 05cb193b2ed546de7013c28b01610fa64a5a2f39
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Aug 18 12:35:31 2011 -0500
Merge the oneshot-hooks branch.
diff --git a/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
index 43bb438..939004c 100644
--- a/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/BasicRoutingService/BasicRoutingStateReplicationIf.ice
@@ -19,6 +19,7 @@
#include <Ice/Identity.ice>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice>
#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice>
module AsteriskSCF
{
@@ -100,6 +101,7 @@ module V1
{
AsteriskSCF::SessionCommunications::V1::Session *source;
string destination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHook* hook;
};
const string RouteSessionOpStartKeyMod = ".START";
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.cpp b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
index 844bd7e..93c0110 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.cpp
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.cpp
@@ -213,6 +213,7 @@ ConnectBridgedSessionsWithDestinationOperation::ConnectBridgedSessionsWithDestin
const std::string& operationId,
const SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -224,7 +225,8 @@ ConnectBridgedSessionsWithDestinationOperation::ConnectBridgedSessionsWithDestin
ConnectBridgedSessionsWithDestinationOp::STATE_LOOKUP,
operationId),
mSessionToReplace(sessionToReplace),
- mDestination(destination)
+ mDestination(destination),
+ mHook(oneShotHook)
{
initStateMachine();
}
@@ -237,6 +239,7 @@ ConnectBridgedSessionsWithDestinationOperationPtr ConnectBridgedSessionsWithDest
const std::string& operationId,
const SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -246,6 +249,7 @@ ConnectBridgedSessionsWithDestinationOperationPtr ConnectBridgedSessionsWithDest
operationId,
sessionToReplace,
destination,
+ oneShotHook,
current,
context,
listener) );
@@ -450,7 +454,7 @@ void ConnectBridgedSessionsWithDestinationOperation::establishBridgeState()
}
// Add a session
- SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mListenerManager);
+ SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mHook, mListenerManager);
if (mListenerManager->getListener()->getNumSessions() < 2)
{
diff --git a/src/ConnectBridgedSessionsWithDestinationOperation.h b/src/ConnectBridgedSessionsWithDestinationOperation.h
index c7a142f..988ab96 100644
--- a/src/ConnectBridgedSessionsWithDestinationOperation.h
+++ b/src/ConnectBridgedSessionsWithDestinationOperation.h
@@ -71,6 +71,7 @@ public:
const std::string& operationId,
const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -111,6 +112,7 @@ protected:
const std::string& operationId,
const AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -165,6 +167,7 @@ private:
// Operation input params.
AsteriskSCF::SessionCommunications::V1::SessionPrx mSessionToReplace;
std::string mDestination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx mHook;
::Ice::Current mIceCurrent;
// Implementation state
diff --git a/src/RouteSessionOperation.cpp b/src/RouteSessionOperation.cpp
index 6377276..63bd4d3 100644
--- a/src/RouteSessionOperation.cpp
+++ b/src/RouteSessionOperation.cpp
@@ -215,6 +215,7 @@ RouteSessionOperation::RouteSessionOperation(const AMD_SessionRouter_routeSessio
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -226,7 +227,8 @@ RouteSessionOperation::RouteSessionOperation(const AMD_SessionRouter_routeSessio
RouteSessionOp::STATE_LOOKUP,
operationId),
mSource(source),
- mDestination(destination)
+ mDestination(destination),
+ mHook(oneShotHook)
{
initStateMachine();
}
@@ -238,6 +240,7 @@ RouteSessionOperationPtr RouteSessionOperation::create(const AMD_SessionRouter_r
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener)
@@ -247,6 +250,7 @@ RouteSessionOperationPtr RouteSessionOperation::create(const AMD_SessionRouter_r
operationId,
source,
destination,
+ oneShotHook,
current,
context,
listener));
@@ -303,6 +307,7 @@ void RouteSessionOperation::reflectUpdate(const AsteriskSCF::Replication::BasicR
{
mSource = item->source;
mDestination = item->destination;
+ mHook = item->hook;
mOperationId = item->operationId;
mReplicatedStates.push_back(RouteSessionOp::STATE_LOOKUP);
@@ -462,7 +467,7 @@ void RouteSessionOperation::establishBridgeState()
}
// Add a session to the endpoints.
- SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mListenerManager);
+ SessionSeq newSessions = createSessionForEndpoints(mLookupResult, mDestination, mHook, mListenerManager);
if (mListenerManager->getListener()->getNumSessions() < 2)
{
diff --git a/src/RouteSessionOperation.h b/src/RouteSessionOperation.h
index b5ce75c..8ab5f63 100644
--- a/src/RouteSessionOperation.h
+++ b/src/RouteSessionOperation.h
@@ -69,6 +69,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -103,6 +104,7 @@ protected:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current,
const SessionContextPtr& context,
OperationsManager* const listener);
@@ -173,6 +175,7 @@ private:
AsteriskSCF::SessionCommunications::V1::SessionPrx mSource;
AsteriskSCF::SessionCommunications::V1::BridgePrx mBridge;
std::string mDestination;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx mHook;
std::vector<RouteSessionOp::OperationState> mReplicatedStates;
}; // class RouteSessionOperation
diff --git a/src/SessionRouter.cpp b/src/SessionRouter.cpp
index a291f47..8c9962f 100644
--- a/src/SessionRouter.cpp
+++ b/src/SessionRouter.cpp
@@ -163,6 +163,7 @@ void SessionRouter::routeSession_async(const ::AsteriskSCF::SessionCommunication
const ::std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current)
{
// Check the cache for a replica with this transaction Id.
@@ -180,6 +181,7 @@ void SessionRouter::routeSession_async(const ::AsteriskSCF::SessionCommunication
operationId,
source,
destination,
+ oneShotHook,
current,
mImpl->mSessionContext,
mImpl.get()));
@@ -201,6 +203,7 @@ void SessionRouter::connectBridgedSessionsWithDestination_async(const ::Asterisk
const ::std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& current)
{
// Check the cache for a replica with this transaction Id.
@@ -218,6 +221,7 @@ void SessionRouter::connectBridgedSessionsWithDestination_async(const ::Asterisk
operationId,
sessionToReplace,
destination,
+ oneShotHook,
current,
mImpl->mSessionContext,
mImpl.get()));
diff --git a/src/SessionRouter.h b/src/SessionRouter.h
index 6a32948..a2fccc8 100644
--- a/src/SessionRouter.h
+++ b/src/SessionRouter.h
@@ -61,6 +61,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current&);
/**
@@ -80,6 +81,7 @@ public:
const std::string& operationId,
const ::AsteriskSCF::SessionCommunications::V1::SessionPrx& sessionToReplace,
const ::std::string& destination,
+ const ::AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const ::Ice::Current& );
/**
diff --git a/src/SessionRouterOperation.cpp b/src/SessionRouterOperation.cpp
index e0432eb..17afe61 100644
--- a/src/SessionRouterOperation.cpp
+++ b/src/SessionRouterOperation.cpp
@@ -157,6 +157,7 @@ BridgePrx getBridge(SessionPrx session)
*/
SessionSeq createSessionForEndpoints(const EndpointSeq& endpoints,
const std::string& destination,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const SessionListenerManagerPtr& listenerManager)
{
// Add a session
@@ -169,7 +170,7 @@ SessionSeq createSessionForEndpoints(const EndpointSeq& endpoints,
// Create a session on the destination.
lg(Debug) << "createSessionForEndpoints(): Creating a session at destination " << destination;
- SessionPrx destSession = sessionEndpoint->createSession(destination, listenerManager->getListener()->getProxy());
+ SessionPrx destSession = sessionEndpoint->createSession(destination, listenerManager->getListener()->getProxy(), oneShotHook);
if(!destSession)
{
lg(Debug) << " Session endpoint returned a null proxy, continuing with other endpoints";
diff --git a/src/SessionRouterOperation.h b/src/SessionRouterOperation.h
index 19ba933..db25bbb 100644
--- a/src/SessionRouterOperation.h
+++ b/src/SessionRouterOperation.h
@@ -372,6 +372,7 @@ AsteriskSCF::SessionCommunications::V1::BridgePrx getBridge(AsteriskSCF::Session
*/
AsteriskSCF::SessionCommunications::V1::SessionSeq createSessionForEndpoints(const AsteriskSCF::Core::Endpoint::V1::EndpointSeq& endpoints,
const std::string& destination,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx& oneShotHook,
const SessionListenerManagerPtr& listenerManager);
/**
diff --git a/test/MockSessionEndpoint.cpp b/test/MockSessionEndpoint.cpp
index 6c5bcf0..2626809 100644
--- a/test/MockSessionEndpoint.cpp
+++ b/test/MockSessionEndpoint.cpp
@@ -21,6 +21,7 @@
#include "SharedTestData.h"
using namespace AsteriskSCF::SessionCommunications::V1;
+using namespace AsteriskSCF::SessionCommunications::ExtensionPoints::V1;
using namespace std;
namespace AsteriskSCF
@@ -35,7 +36,11 @@ MockSessionEndpoint::MockSessionEndpoint(const std::string& id) :
{
}
-SessionPrx MockSessionEndpoint::createSession(const string& dest, const SessionListenerPrx&, const Ice::Current&)
+SessionPrx MockSessionEndpoint::createSession(
+ const string& dest,
+ const SessionListenerPrx&,
+ const SessionCreationHookPrx&,
+ const Ice::Current&)
{
string sessionId = dest + "_" + mId + "_" + boost::lexical_cast<string>(++mCounter);
diff --git a/test/MockSessionEndpoint.h b/test/MockSessionEndpoint.h
index d83bb3b..a7d7ace 100644
--- a/test/MockSessionEndpoint.h
+++ b/test/MockSessionEndpoint.h
@@ -37,7 +37,11 @@ public:
public:
// Overrides
- AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(const std::string& dest, const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener, const Ice::Current&);
+ AsteriskSCF::SessionCommunications::V1::SessionPrx createSession(
+ const std::string& dest,
+ const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
+ const AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationHookPrx&,
+ const Ice::Current&);
AsteriskSCF::SessionCommunications::V1::SessionSeq getSessions(const Ice::Current&);
void addDefaultSessionListener(const AsteriskSCF::SessionCommunications::V1::SessionListenerPrx& listener,
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 7febc3b..9dfb84d 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -389,13 +389,13 @@ BOOST_FIXTURE_TEST_CASE(RouteSession, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -443,21 +443,21 @@ BOOST_FIXTURE_TEST_CASE(BlindTransfer, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
SharedTestData::instance.mSessionReplaced = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BridgePrx bridge = session->getBridge();
BOOST_CHECK(bridge != 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
// Now transfer to a new extension.
- SharedTestData::instance.sessionRouter->connectBridgedSessionsWithDestination(IceUtil::generateUUID(), session, "103");
+ SharedTestData::instance.sessionRouter->connectBridgedSessionsWithDestination(IceUtil::generateUUID(), session, "103", 0);
BOOST_CHECK(SharedTestData::instance.mSessionReplaced);
@@ -501,13 +501,13 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session101 = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session101 = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session101 != 0);
SharedTestData::instance.mBridgeConnected = false;
BOOST_TEST_MESSAGE("Routing for the first pair...");
- SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_102_" + IceUtil::generateUUID(), session101, "102");
+ SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_102_" + IceUtil::generateUUID(), session101, "102", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -515,7 +515,7 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
MockSessionEndpointPtr session103Endpoint = SharedTestData::instance.endpointLocator->localLookup("103");
BOOST_TEST_MESSAGE("Creating a session on our next endpoint...");
- SessionPrx session103 = session103Endpoint->createSession("104", 0, Ice::Current());
+ SessionPrx session103 = session103Endpoint->createSession("104", 0, 0, Ice::Current());
BOOST_CHECK(session103 != 0);
SharedTestData::instance.mBridgeConnected = false;
@@ -523,7 +523,7 @@ BOOST_FIXTURE_TEST_CASE(AttendedTransfer, PerTestFixture)
BOOST_TEST_MESSAGE("Routing the second pair...");
- SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_104_" + IceUtil::generateUUID(), session103, "104");
+ SharedTestData::instance.sessionRouter->routeSession("Test_AttendedTransfer_104_" + IceUtil::generateUUID(), session103, "104", 0);
BOOST_CHECK(SharedTestData::instance.mBridgeConnected);
@@ -705,7 +705,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
@@ -715,7 +715,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
// Note we're routing using AMI with no callback. The callback would never come due to the
// way the test mode shuts down the operation. Simulates failure.
- SharedTestData::instance.sessionRouter->begin_routeSession(operationId, session, "102");
+ SharedTestData::instance.sessionRouter->begin_routeSession(operationId, session, "102", 0);
for (int counter=0; SharedTestData::instance.endpointLocator->mLookupCalled == false; counter++)
{
@@ -744,7 +744,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverRouteSession, PerTestFixture)
BOOST_CHECK(SharedTestData::instance.serviceReplicaMgmt->isActive() == true);
// Let the backup session router try to route using same operationId.
- SharedTestData::instance.backupSessionRouter->routeSession(operationId, session, "102");
+ SharedTestData::instance.backupSessionRouter->routeSession(operationId, session, "102", 0);
// The lookup should not be done again.
BOOST_CHECK(!SharedTestData::instance.endpointLocator->mLookupCalled);
@@ -793,14 +793,14 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
MockSessionEndpointPtr session101Endpoint = SharedTestData::instance.endpointLocator->localLookup("101");
BOOST_TEST_MESSAGE("Creating a session on our test endpoint...");
- SessionPrx session = session101Endpoint->createSession("102", 0, Ice::Current());
+ SessionPrx session = session101Endpoint->createSession("102", 0, 0, Ice::Current());
BOOST_CHECK(session != 0);
SharedTestData::instance.mBridgeConnected = false;
SharedTestData::instance.mSessionReplaced = false;
BOOST_TEST_MESSAGE("Routing the session...");
- SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102");
+ SharedTestData::instance.sessionRouter->routeSession(IceUtil::generateUUID(), session, "102", 0);
BridgePrx bridge = session->getBridge();
BOOST_CHECK(bridge != 0);
@@ -809,7 +809,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
string operationId = IceUtil::generateUUID();
// Now transfer to a new extension. In our test mode, this operation will never complete.
- SharedTestData::instance.sessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session, "103");
+ SharedTestData::instance.sessionRouter->begin_connectBridgedSessionsWithDestination(operationId, session, "103", 0);
for (int counter=0; SharedTestData::instance.mSessionReplaced == false; counter++)
{
@@ -840,7 +840,7 @@ BOOST_FIXTURE_TEST_CASE(FailoverConnectBridgedSessWithDest, PerTestFixture)
BOOST_CHECK(SharedTestData::instance.serviceReplicaMgmt->isActive() == true);
// Let the backup session router try to route using same operationId. Synchronous call.
- SharedTestData::instance.backupSessionRouter->connectBridgedSessionsWithDestination(operationId, session, "103");
+ SharedTestData::instance.backupSessionRouter->connectBridgedSessionsWithDestination(operationId, session, "103", 0);
// The lookup should not be done again.
BOOST_CHECK(SharedTestData::instance.endpointLocator->mLookupCalled == false);
-----------------------------------------------------------------------
--
asterisk-scf/release/routing.git
More information about the asterisk-scf-commits
mailing list