[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  f4427af1821000f5b16750ad67fc66ca9e45c915 (commit)
      from  6041bae5bef378b2f7913f7bea1077c56cc48c71 (commit)

Summary of changes:
 config/test_bridging.conf |    6 ++++--
 test/TestBridging.cpp     |   29 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit f4427af1821000f5b16750ad67fc66ca9e45c915
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Apr 30 15:53:46 2012 -0500

    Updates for the change of default mode to standby. Sets the ServiceDiscovery for unit tests to Standalone,
    and the test driver activates the primary bridge service.

diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index 14bd200..09079b8 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -23,6 +23,9 @@ IceBox.InheritProperties=1
 Ice.ThreadPool.Client.Size=10
 Ice.ThreadPool.Server.Size=10
 
+# For unit test we don't replicate the Service Locator
+ServiceDiscovery.Standalone = true
+
 ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
 ServiceDiscovery.IceStorm.TopicManager.ThreadPool.Size=4
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
@@ -42,6 +45,7 @@ LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
 
 LoggerAdapter.Endpoints=default
 Logger.ServiceAdapter.Endpoints=default
+Logger.Standalone = true
 AsteriskSCF.LoggingService.Endpoints=default
 AsteriskSCF.LoggingService.ThreadPool.Size=4
 AsteriskSCF.LoggingClient.Endpoints=default
@@ -82,12 +86,10 @@ TestBridge.ServiceAdapter.Endpoints=default -h 127.0.0.1 -p 57000
 TestBridge.ServiceAdapter.ThreadPool.Size=2
 TestBridge.BackplaneAdapter.Endpoints=default -h 127.0.0.1 -p 57001
 TestBridge.BackplaneAdapter.ThreadPool.Size=2
-TestBridge.Standby=false
 TestBridge.LogLevel=1
 
 TestBridge2.InstanceName=TestBridge2
 TestBridge2.BridgeManagerObjectId=TestBridgeManager2
-TestBridge2.Standby=true
 TestBridge2.ServiceAdapter.Endpoints=default -h 127.0.0.1 -p 57010
 TestBridge2.ServiceAdapter.ThreadPool.Size=4
 TestBridge2.BackplaneAdapter.Endpoints=default -h 127.0.0.1 -p 57011
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 63ae68e..f166e92 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -282,6 +282,22 @@ private:
             throw IceBox::FailureException(__FILE__, __LINE__, 
                 "Configuration error: Unable to locate required property");
         }
+
+        ServiceLocatorParamsPtr primaryReplicaParams(new ServiceLocatorParams);
+        primaryReplicaParams->category = "BridgeService.Replica";
+        primaryReplicaParams->service = "default";
+        primaryReplicaParams->id = "TestBridge";
+        try
+        {
+            mPrimaryReplica = ReplicaPrx::uncheckedCast(locator->locate(primaryReplicaParams));
+        }
+        catch(const AsteriskSCF::Core::Discovery::V1::ServiceNotFound&)
+        {
+            throw;
+        }
+
+        mPrimaryReplica->activate(AsteriskSCF::Operations::createContext());
+
         //
         // Get all registered bridge manager proxies and use identity comparisons to get
         // the correct one.
@@ -299,19 +315,6 @@ private:
             throw;
         }
 
-        ServiceLocatorParamsPtr primaryReplicaParams(new ServiceLocatorParams);
-        primaryReplicaParams->category = "BridgeService.Replica";
-        primaryReplicaParams->service = "default";
-        primaryReplicaParams->id = "TestBridge";
-        try
-        {
-            mPrimaryReplica = ReplicaPrx::uncheckedCast(locator->locate(primaryReplicaParams));
-        }
-        catch(const AsteriskSCF::Core::Discovery::V1::ServiceNotFound&)
-        {
-            throw;
-        }
-
         ServiceLocatorParamsPtr secondaryReplicaParams(new ServiceLocatorParams);
         secondaryReplicaParams->category = "BridgeService.Replica";
         secondaryReplicaParams->service = "default";

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git