Fixing GPON issue and consolidating xgsponBbsim and xgspon
Change-Id: Ifbd7e1c74a4a44cef4b19691494ade4575c6d941
diff --git a/VERSION b/VERSION
index 5c5bdc2..be706e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.21
+3.1.22
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index 492c9e8..ff37326 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -374,10 +374,9 @@
}
const (
- xgspon = "xgspon"
- xgsponBbsim = "XGS-PON"
- gpon = "gpon"
- epon = "EPON"
+ xgspon = "XGS-PON"
+ gpon = "GPON"
+ epon = "EPON"
)
func (t *TechProfileMgr) SetKVClient() *db.Backend {
@@ -450,7 +449,7 @@
// is broken into ["XGS-PON" "64" ...]
pathSlice := regexp.MustCompile(`/`).Split(path, -1)
switch pathSlice[0] {
- case xgspon, xgsponBbsim, gpon:
+ case xgspon, gpon:
resPtr = &KvTpIns
case epon:
resPtr = &KvEponIns
@@ -1367,7 +1366,7 @@
for kvPath, kvPair := range kvPairs {
if value, err := kvstore.ToByte(kvPair.Value); err == nil {
- if tech == xgspon || tech == xgsponBbsim || tech == gpon {
+ if tech == xgspon || tech == gpon {
if err = json.Unmarshal(value, &tpTech); err != nil {
logger.Errorw("error-unmarshal-kv-pair", log.Fields{"kvPath": kvPath, "value": value})
continue
@@ -1386,7 +1385,7 @@
}
switch tech {
- case xgspon, xgsponBbsim, gpon:
+ case xgspon, gpon:
return tpInstancesTech
case epon:
return tpInstancesEpon