Test client for remote user account connector and service. It seems to be working.
Diva Canto
parent
f8c79fe20a
commit
8bed461957
|
|
@ -174,14 +174,14 @@ namespace OpenSim.Server.Handlers.UserAccounts
|
|||
|
||||
byte[] StoreAccount(Dictionary<string, object> request)
|
||||
{
|
||||
if (!request.ContainsKey("account"))
|
||||
return FailureResult();
|
||||
if (request["account"] == null)
|
||||
return FailureResult();
|
||||
if (!(request["account"] is Dictionary<string, object>))
|
||||
return FailureResult();
|
||||
//if (!request.ContainsKey("account"))
|
||||
// return FailureResult();
|
||||
//if (request["account"] == null)
|
||||
// return FailureResult();
|
||||
//if (!(request["account"] is Dictionary<string, object>))
|
||||
// return FailureResult();
|
||||
|
||||
UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]);
|
||||
UserAccount account = new UserAccount(request);
|
||||
|
||||
if (m_UserAccountService.StoreUserAccount(account))
|
||||
return SuccessResult();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
; * Run a ROBUST server shell like this, from bin:
|
||||
; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
|
||||
; *
|
||||
; * Then run this client like this, from bin:
|
||||
; * $ OpenSim.Tests.Clients.UserAccountClient.exe
|
||||
; *
|
||||
; *
|
||||
|
||||
[Startup]
|
||||
ServiceConnectors = "OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
|
||||
|
||||
; * This is common for all services, it's the network setup for the entire
|
||||
; * server instance
|
||||
; *
|
||||
[Network]
|
||||
port = 8003
|
||||
|
||||
; * The following are for the remote console
|
||||
; * They have no effect for the local or basic console types
|
||||
; * Leave commented to diable logins to the console
|
||||
;ConsoleUser = Test
|
||||
;ConsolePass = secret
|
||||
|
||||
; * As an example, the below configuration precisely mimicks the legacy
|
||||
; * asset server. It is read by the asset IN connector (defined above)
|
||||
; * and it then loads the OUT connector (a local database module). That,
|
||||
; * in turn, reads the asset loader and database connection information
|
||||
; *
|
||||
[UserAccountService]
|
||||
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
|
||||
StorageProvider = "OpenSim.Data.MySQL.dll"
|
||||
ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
|
||||
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Reflection;
|
||||
|
||||
using OpenMetaverse;
|
||||
using log4net;
|
||||
using log4net.Appender;
|
||||
using log4net.Layout;
|
||||
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenSim.Services.Connectors;
|
||||
|
||||
namespace OpenSim.Tests.Clients.PresenceClient
|
||||
{
|
||||
public class UserAccountsClient
|
||||
{
|
||||
private static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
ConsoleAppender consoleAppender = new ConsoleAppender();
|
||||
consoleAppender.Layout =
|
||||
new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
|
||||
log4net.Config.BasicConfigurator.Configure(consoleAppender);
|
||||
|
||||
string serverURI = "http://127.0.0.1:8003";
|
||||
UserAccountServicesConnector m_Connector = new UserAccountServicesConnector(serverURI);
|
||||
|
||||
UUID user1 = UUID.Random();
|
||||
string first = "Completely";
|
||||
string last = "Clueless";
|
||||
string email = "foo@bar.com";
|
||||
|
||||
UserAccount account = new UserAccount(user1);
|
||||
account.FirstName = first;
|
||||
account.LastName = last;
|
||||
account.Email = email;
|
||||
account.ServiceURLs = new Dictionary<string, object>();
|
||||
account.ServiceURLs.Add("InventoryServerURI", "http://cnn.com");
|
||||
account.ServiceURLs.Add("AssetServerURI", "http://cnn.com");
|
||||
|
||||
bool success = m_Connector.StoreUserAccount(account);
|
||||
if (success)
|
||||
m_log.InfoFormat("[USER CLIENT]: Successfully created account for user {0} {1}", account.FirstName, account.LastName);
|
||||
else
|
||||
m_log.InfoFormat("[USER CLIENT]: failed to create user {0} {1}", account.FirstName, account.LastName);
|
||||
|
||||
System.Console.WriteLine("\n");
|
||||
|
||||
account = m_Connector.GetUserAccount(UUID.Zero, user1);
|
||||
if (account == null)
|
||||
m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by UUID for {0}", user1);
|
||||
else
|
||||
{
|
||||
m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
|
||||
account.PrincipalID, account.FirstName, account.LastName, account.Email);
|
||||
foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
|
||||
m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
|
||||
}
|
||||
|
||||
System.Console.WriteLine("\n");
|
||||
|
||||
account = m_Connector.GetUserAccount(UUID.Zero, first, last);
|
||||
if (account == null)
|
||||
m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by name for {0}", user1);
|
||||
else
|
||||
{
|
||||
m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
|
||||
account.PrincipalID, account.FirstName, account.LastName, account.Email);
|
||||
foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
|
||||
m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
|
||||
}
|
||||
|
||||
System.Console.WriteLine("\n");
|
||||
account = m_Connector.GetUserAccount(UUID.Zero, email);
|
||||
if (account == null)
|
||||
m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by email for {0}", user1);
|
||||
else
|
||||
{
|
||||
m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
|
||||
account.PrincipalID, account.FirstName, account.LastName, account.Email);
|
||||
foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
|
||||
m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
28
prebuild.xml
28
prebuild.xml
|
|
@ -3002,6 +3002,34 @@
|
|||
</Files>
|
||||
</Project>
|
||||
|
||||
<Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
<Configuration name="Release">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
|
||||
<ReferencePath>../../../../bin/</ReferencePath>
|
||||
<Reference name="System"/>
|
||||
<Reference name="OpenMetaverseTypes.dll"/>
|
||||
<Reference name="OpenMetaverse.dll"/>
|
||||
<Reference name="OpenSim.Framework"/>
|
||||
<Reference name="OpenSim.Services.Interfaces" />
|
||||
<Reference name="OpenSim.Services.Connectors" />
|
||||
<Reference name="Nini.dll" />
|
||||
<Reference name="log4net.dll"/>
|
||||
|
||||
<Files>
|
||||
<Match pattern="*.cs" recurse="true"/>
|
||||
</Files>
|
||||
</Project>
|
||||
|
||||
|
||||
<!-- Test assemblies -->
|
||||
<Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
|
||||
<Configuration name="Debug">
|
||||
|
|
|
|||
Loading…
Reference in New Issue