Merge a524b01 into 41665f7

config/local.yaml

@@ -78,3 +78,5 @@ loadtest:
       probability: 1
     selfDeleteMembership:
       probability: 1
+    searchClans:
+      probability: 1

loadtest/README.md

@@ -58,6 +58,8 @@ loadtest:
       probability: 1
     selfDeleteMembership:
       probability: 1
+    searchClans:
+      probability: 1
 ```
 Or setting the following environment variables:
 ```
@@ -70,6 +72,7 @@ KHAN_LOADTEST_OPERATIONS_LEAVECLAN_PROBABILITY (default: 0.01)
 KHAN_LOADTEST_OPERATIONS_TRANSFERCLANOWNERSHIP_PROBABILITY (default: 0.01)
 KHAN_LOADTEST_OPERATIONS_APPLYFORMEMBERSHIP_PROBABILITY (default: 0.01)
 KHAN_LOADTEST_OPERATIONS_SELFDELETEMEMBERSHIP_PROBABILITY (default: 0.01)
+KHAN_LOADTEST_OPERATIONS_SEARCHCLANS_PROBABILITY (default: 0.01)
 ```
 
 # Operations with clans shared among different load test processes

loadtest/app.go

@@ -41,9 +41,6 @@ func (app *App) configure(configFile, sharedClansFile string) {
 }
 
 func (app *App) setConfigurationDefaults() {
-	app.setPlayerConfigurationDefaults()
-	app.setClanConfigurationDefaults()
-	app.setMembershipConfigurationDefaults()
 	app.setClientConfigurationDefaults()
 }
 

loadtest/clan.go

@@ -4,22 +4,17 @@ import (
 	"github.com/topfreegames/khan/lib"
 )
 
-func (app *App) setClanConfigurationDefaults() {
-	app.setOperationProbabilityConfigDefault("updateSharedClanScore", 1)
-	app.setOperationProbabilityConfigDefault("createClan", 1)
-	app.setOperationProbabilityConfigDefault("leaveClan", 1)
-	app.setOperationProbabilityConfigDefault("transferClanOwnership", 1)
-}
-
 func (app *App) configureClanOperations() {
 	app.appendOperation(app.getUpdateSharedClanScoreOperation())
 	app.appendOperation(app.getCreateClanOperation())
 	app.appendOperation(app.getLeaveClanOperation())
 	app.appendOperation(app.getTransferClanOwnershipOperation())
+	app.appendOperation(app.getSearchClansOperation())
 }
 
 func (app *App) getUpdateSharedClanScoreOperation() operation {
 	operationKey := "updateSharedClanScore"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {
@@ -92,6 +87,7 @@ func (app *App) getUpdateSharedClanScoreOperation() operation {
 
 func (app *App) getCreateClanOperation() operation {
 	operationKey := "createClan"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {
@@ -130,6 +126,7 @@ func (app *App) getCreateClanOperation() operation {
 
 func (app *App) getLeaveClanOperation() operation {
 	operationKey := "leaveClan"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {
@@ -165,6 +162,7 @@ func (app *App) getLeaveClanOperation() operation {
 
 func (app *App) getTransferClanOwnershipOperation() operation {
 	operationKey := "transferClanOwnership"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {
@@ -193,3 +191,27 @@ func (app *App) getTransferClanOwnershipOperation() operation {
 		},
 	}
 }
+
+func (app *App) getSearchClansOperation() operation {
+	operationKey := "searchClans"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
+	return operation{
+		probability: app.getOperationProbabilityConfig(operationKey),
+		canExecute: func() (bool, error) {
+			return true, nil
+		},
+		execute: func() error {
+			searchClansResult, err := app.client.SearchClans(nil, getRandomClanName())
+			if err != nil {
+				return err
+			}
+			if searchClansResult == nil {
+				return &GenericError{"NilPayloadError", "Operation searchClans returned no error with nil payload."}
+			}
+			if !searchClansResult.Success {
+				return &GenericError{"FailurePayloadError", "Operation searchClans returned no error with failure payload."}
+			}
+			return nil
+		},
+	}
+}

loadtest/membership.go

@@ -4,19 +4,15 @@ import (
 	"github.com/topfreegames/khan/lib"
 )
 
-func (app *App) setMembershipConfigurationDefaults() {
-	app.setOperationProbabilityConfigDefault("applyForMembership", 1)
-	app.setOperationProbabilityConfigDefault("selfDeleteMembership", 1)
-}
-
 func (app *App) configureMembershipOperations() {
 	app.appendOperation(app.getApplyForMembershipOperation())
 	app.appendOperation(app.getSelfDeleteMembershipOperation())
 }
 
 func (app *App) getApplyForMembershipOperation() operation {
-	membershipLevel := app.config.GetString("loadtest.game.membershipLevel")
 	operationKey := "applyForMembership"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
+	membershipLevel := app.config.GetString("loadtest.game.membershipLevel")
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {
@@ -67,6 +63,7 @@ func (app *App) getApplyForMembershipOperation() operation {
 
 func (app *App) getSelfDeleteMembershipOperation() operation {
 	operationKey := "selfDeleteMembership"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {

loadtest/player.go

@@ -1,15 +1,12 @@
 package loadtest
 
-func (app *App) setPlayerConfigurationDefaults() {
-	app.setOperationProbabilityConfigDefault("createPlayer", 1)
-}
-
 func (app *App) configurePlayerOperations() {
 	app.appendOperation(app.getCreatePlayerOperation())
 }
 
 func (app *App) getCreatePlayerOperation() operation {
 	operationKey := "createPlayer"
+	app.setOperationProbabilityConfigDefault(operationKey, 1)
 	return operation{
 		probability: app.getOperationProbabilityConfig(operationKey),
 		canExecute: func() (bool, error) {