[VOL-2588] Simplify TT case
Change-Id: Ia22dbda21b0702ac0444a17ae3e5063c7723e395
diff --git a/core/subscriber_manager.go b/core/subscriber_manager.go
index 5610d2c..d84fad9 100644
--- a/core/subscriber_manager.go
+++ b/core/subscriber_manager.go
@@ -18,10 +18,12 @@
import (
"fmt"
+
"github.com/opencord/openolt-scale-tester/config"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
- oop "github.com/opencord/voltha-protos/v2/go/openolt"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/techprofile"
+ oop "github.com/opencord/voltha-protos/v3/go/openolt"
+ "golang.org/x/net/context"
)
func init() {
@@ -86,7 +88,8 @@
RsrMgr *OpenOltResourceMgr
}
-func (subs *Subscriber) Start(onuCh chan bool) {
+func (subs *Subscriber) Start(onuCh chan bool, isGroup bool) {
+ var err error
log.Infow("workflow-deploy-started-for-subscriber", log.Fields{"subsName": subs.SubscriberName})
@@ -94,9 +97,9 @@
for _, tpID := range subs.TestConfig.TpIDList {
uniPortName := fmt.Sprintf(UniPortName, subs.PonIntf, subs.OnuID, subs.UniID)
- if subs.TpInstance[tpID] =
- subs.RsrMgr.ResourceMgrs[subs.PonIntf].TechProfileMgr.CreateTechProfInstance(
- uint32(tpID), uniPortName, subs.PonIntf); subs.TpInstance[tpID] == nil {
+ if subs.TpInstance[tpID], err =
+ subs.RsrMgr.ResourceMgrs[subs.PonIntf].TechProfileMgr.CreateTechProfInstance(context.Background(),
+ uint32(tpID), uniPortName, subs.PonIntf); err != nil {
log.Errorw("error-creating-tp-instance-for-subs",
log.Fields{"subsName": subs.SubscriberName, "onuID": subs.OnuID, "tpID": tpID})
@@ -107,7 +110,7 @@
}
}
- DeployWorkflow(subs)
+ DeployWorkflow(subs, isGroup)
log.Infow("workflow-deploy-completed-for-subscriber", log.Fields{"subsName": subs.SubscriberName})