[VOL-4632] Adding NniDhcpTrapVid to support FTTB usecase

Change-Id: I405ee0d3d4bbb0c925826587f1f8704f4bebc309
diff --git a/VERSION b/VERSION
index cae7e60..1c09c74 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.3-dev
+0.3.3
diff --git a/internal/core/sadis_if.go b/internal/core/sadis_if.go
index 049e33a..60514c8 100644
--- a/internal/core/sadis_if.go
+++ b/internal/core/sadis_if.go
@@ -52,6 +52,7 @@
 	IPAddress          string `json:"ipAddress"`
 	NasID              string `json:"nasId"`
 	UplinkPort         int    `json:"uplinkPort"`
+	NniDhcpTrapVid     int    `json:"nniDhcpTrapVid,omitempty"`
 	// onu
 	NasPortID  string        `json:"nasPortId"`
 	CircuitID  string        `json:"circuitId"`
@@ -65,6 +66,7 @@
 	IPAddress          string `json:"ipAddress"`
 	NasID              string `json:"nasId"`
 	UplinkPort         int    `json:"uplinkPort"`
+	NniDhcpTrapVid     int    `json:"nniDhcpTrapVid,omitempty"`
 }
 
 type SadisOnuEntryV2 struct {
diff --git a/internal/core/watcher.go b/internal/core/watcher.go
index 125edeb..ba9b5f8 100644
--- a/internal/core/watcher.go
+++ b/internal/core/watcher.go
@@ -178,6 +178,7 @@
 				IPAddress:          entry.IPAddress,
 				NasID:              entry.NasID,
 				UplinkPort:         entry.UplinkPort,
+				NniDhcpTrapVid:     entry.NniDhcpTrapVid,
 			}
 			w.store.addOlt(ctx, e)
 			continue