1. FTTB fixes
2. Delete subscriber with payload
3. Correct ServiceName field in programmed-subscribers response
Change-Id: I54fd24ff08e5c10efdbd0c43623bf699d890bdd8
diff --git a/internal/pkg/application/vnets.go b/internal/pkg/application/vnets.go
index 1817b5d..c8e51d4 100644
--- a/internal/pkg/application/vnets.go
+++ b/internal/pkg/application/vnets.go
@@ -945,7 +945,7 @@
matchpbitsFunc := func(key, value interface{}) bool {
svc := value.(*VoltService)
for _, pbit := range svc.Pbits {
- if uint8(pbit) == priority {
+ if uint8(pbit) == priority || uint8(pbit) == uint8(of.PbitMatchAll) {
logger.Infow(ctx, "Pbit match found with service",
log.Fields{"Pbit": priority, "serviceName": svc.Name})
pbitFound = true
@@ -1683,7 +1683,7 @@
vs := value.(*VoltService)
var writemetadata uint64
if vpv.VnetType == DpuMgmtTraffic {
- writemetadata = uint64(vs.SVlan)<<48 + uint64(vs.TechProfileID)<<32
+ writemetadata = uint64(vs.TechProfileID)<<32 + uint64(vs.UsMeterID)
} else {
writemetadata = uint64(vs.TechProfileID) << 32
}