[VOL-2890] Using olt-device-id in the path of a tech-profile
Change-Id: I5285150fa5ce537047a6956585c28aad9915841e
diff --git a/VERSION b/VERSION
index ef538c2..ff365e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.2
+3.1.3
diff --git a/pkg/db/backend.go b/pkg/db/backend.go
index faa86ed..42574d0 100644
--- a/pkg/db/backend.go
+++ b/pkg/db/backend.go
@@ -222,7 +222,7 @@
defer b.Unlock()
formattedPath := b.makePath(key)
- logger.Debugw("putting-key", log.Fields{"key": key, "value": value, "path": formattedPath})
+ logger.Debugw("putting-key", log.Fields{"key": key, "path": formattedPath})
err := b.Client.Put(ctx, formattedPath, value)
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index 2c6e67b..4473389 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -100,7 +100,7 @@
}
// Required uniPortName format
-var uniPortNameFormat = regexp.MustCompile(`^pon-{[0-9]+}/onu-{[0-9]+}/uni-{[0-9]+}$`)
+var uniPortNameFormat = regexp.MustCompile(`^olt-{[a-z0-9\-]+}/pon-{[0-9]+}/onu-{[0-9]+}/uni-{[0-9]+}$`)
/*
type InferredAdditionBWIndication int32
@@ -295,6 +295,10 @@
}
func (t *TechProfileMgr) GetTechProfileInstanceKVPath(techProfiletblID uint32, uniPortName string) string {
+ logger.Debugw("get-tp-instance-kv-path", log.Fields{
+ "uniPortName": uniPortName,
+ "tpId": techProfiletblID,
+ })
return fmt.Sprintf(t.config.TPInstanceKVPath, t.resourceMgr.GetTechnology(), techProfiletblID, uniPortName)
}
@@ -304,6 +308,8 @@
var err error
var kvResult *kvstore.KVPair
+ logger.Infow("get-tp-instance-form-kv-store", log.Fields{"path": path, "tpid": techProfiletblID})
+
kvResult, _ = t.config.KVBackend.Get(ctx, path)
if kvResult == nil {
logger.Infow("tp-instance-not-found-on-kv", log.Fields{"key": path})