[core] Add epn_topology for Bookkeeping

Author: miltalex

core/bookkeeping/api.go

@@ -66,7 +66,7 @@ func Instance() *BookkeepingWrapper {
 	return instance
 }
 
-func (bk *BookkeepingWrapper) CreateRun(activityId string, nDetectors int, nEpns int, nFlps int, runNumber int32, runType string, timeO2Start time.Time, timeTrgStart time.Time, dd_flp bool, dcs bool, epn bool) {
+func (bk *BookkeepingWrapper) CreateRun(activityId string, nDetectors int, nEpns int, nFlps int, runNumber int32, runType string, timeO2Start time.Time, timeTrgStart time.Time, dd_flp bool, dcs bool, epn bool, epnTopology string) {
 	var runtypeAPI sw.RunType
 	switch runType {
 	case string(sw.TECHNICAL_RunType):
@@ -80,7 +80,7 @@ func (bk *BookkeepingWrapper) CreateRun(activityId string, nDetectors int, nEpns
 		runtypeAPI = sw.TECHNICAL_RunType
 	}
 
-	clientAPI.CreateRun(activityId, int32(nDetectors), int32(nEpns), int32(nFlps), runNumber, runtypeAPI, timeO2Start, timeTrgStart, dd_flp, dcs, epn)
+	clientAPI.CreateRun(activityId, int32(nDetectors), int32(nEpns), int32(nFlps), runNumber, runtypeAPI, timeO2Start, timeTrgStart, dd_flp, dcs, epn, epnTopology)
 }
 
 func (bk *BookkeepingWrapper) UpdateRun(runNumber int32, runResult string, timeO2End time.Time, timeTrgEnd time.Time) {

core/environment/transition_startactivity.go

@@ -68,7 +68,8 @@ func (t StartActivityTransition) do(env *Environment) (err error) {
 	dd_enabled, _ := strconv.ParseBool(env.GetKV("","dd_enabled"))
 	dcs_enabled, _ := strconv.ParseBool(env.GetKV("","dcs_enabled"))
 	epn_enabled, _ := strconv.ParseBool(env.GetKV("","epn_enabled"))
-	the.BookkeepingAPI().CreateRun(env.Id().String(), len(env.GetActiveDetectors()), 0, len(flps), int32(runNumber), env.GetRunType().String(), time.Now(), time.Now(), dd_enabled, dcs_enabled, epn_enabled )
+	odc_topology := env.GetKV("","odc_topology")
+	the.BookkeepingAPI().CreateRun(env.Id().String(), len(env.GetActiveDetectors()), 0, len(flps), int32(runNumber), env.GetRunType().String(), time.Now(), time.Now(), dd_enabled, dcs_enabled, epn_enabled, odc_topology)
 	for _, flp := range flps {
 		the.BookkeepingAPI().CreateFlp(flp, flp, int32(runNumber))
 	}

go.mod

@@ -20,8 +20,8 @@ require (
 	cloud.google.com/go v0.76.0 // indirect
 	cloud.google.com/go/firestore v1.4.0 // indirect
 	github.com/AlecAivazis/survey/v2 v2.2.7
-	github.com/AliceO2Group/Bookkeeping v0.17.6 // indirect
-	github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210917100552-e0d4d674fe89
+	github.com/AliceO2Group/Bookkeeping v0.17.7 // indirect
+	github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210924092906-25a559aecc82
 	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect

go.sum

@@ -87,6 +87,8 @@ github.com/AliceO2Group/Bookkeeping v0.16.9 h1:yqMR7e4FDjAeNbSJ08WJJN1ug0k/VyFiE
 github.com/AliceO2Group/Bookkeeping v0.16.9/go.mod h1:Ig2ePkJuGnTF9NH+f8f1h5A8yGIuWowPHBlpQHn/0NU=
 github.com/AliceO2Group/Bookkeeping v0.17.6 h1:O6D3wr5+twn0JQHiSz5+4TWdhNmWFYqxxdtPXUxlAjI=
 github.com/AliceO2Group/Bookkeeping v0.17.6/go.mod h1:Ig2ePkJuGnTF9NH+f8f1h5A8yGIuWowPHBlpQHn/0NU=
+github.com/AliceO2Group/Bookkeeping v0.17.7 h1:22Mb6Hdp9tZ3z8QeAjm81S4HiLaNLBVZ5Mn3TWRSQqI=
+github.com/AliceO2Group/Bookkeeping v0.17.7/go.mod h1:Ig2ePkJuGnTF9NH+f8f1h5A8yGIuWowPHBlpQHn/0NU=
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210308150404-e78be0de914f h1:s8o3xu0+3TrjYuRypa5C4XyLOIpoLxupdnS5z2LetDU=
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210308150404-e78be0de914f/go.mod h1:w64yucnc/ncO+KGk26OY4Uhy+Vf/WAbU85ZfunlN7XM=
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210409104827-fd1b74c641ba h1:hbiftnpE/yrRFcuuo2DGOtLhcyy1SFer1cWLS/GWG00=
@@ -95,6 +97,8 @@ github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210504163454-decc0eed
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210504163454-decc0eed681e/go.mod h1:w64yucnc/ncO+KGk26OY4Uhy+Vf/WAbU85ZfunlN7XM=
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210917100552-e0d4d674fe89 h1:Wfo58o2d/ILS7Kz+tmVEBb/Gg9Dd2bOr17gH+Na3lKU=
 github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210917100552-e0d4d674fe89/go.mod h1:w64yucnc/ncO+KGk26OY4Uhy+Vf/WAbU85ZfunlN7XM=
+github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210924092906-25a559aecc82 h1:2qYbJeWSSpG5cr7usLewzNaC3f7czW1of4uoHLoeXyY=
+github.com/AliceO2Group/Bookkeeping/go-api-client v0.0.0-20210924092906-25a559aecc82/go.mod h1:w64yucnc/ncO+KGk26OY4Uhy+Vf/WAbU85ZfunlN7XM=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc=