diff --git a/VERSION b/VERSION
index ef8e66f..f8f4f03 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.12.1-dev
+1.12.1
diff --git a/api/bbsim/bbsim.pb.go b/api/bbsim/bbsim.pb.go
index b31a4db..71d1ee3 100644
--- a/api/bbsim/bbsim.pb.go
+++ b/api/bbsim/bbsim.pb.go
@@ -386,6 +386,7 @@
 	IP                   string     `protobuf:"bytes,7,opt,name=IP,proto3" json:"IP,omitempty"`
 	NNIPorts             []*NNIPort `protobuf:"bytes,5,rep,name=NNIPorts,proto3" json:"NNIPorts,omitempty"`
 	PONPorts             []*PONPort `protobuf:"bytes,6,rep,name=PONPorts,proto3" json:"PONPorts,omitempty"`
+	NniDhcpTrapVid       int32      `protobuf:"varint,8,opt,name=NniDhcpTrapVid,proto3" json:"NniDhcpTrapVid,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -465,6 +466,13 @@
 	return nil
 }
 
+func (m *Olt) GetNniDhcpTrapVid() int32 {
+	if m != nil {
+		return m.NniDhcpTrapVid
+	}
+	return 0
+}
+
 type OltAllocatedResourceType struct {
 	Type                 OltAllocatedResourceType_Type `protobuf:"varint,1,opt,name=type,proto3,enum=bbsim.OltAllocatedResourceType_Type" json:"type,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
@@ -1910,149 +1918,151 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim.proto", fileDescriptor_ef7750073d18011b) }
 
 var fileDescriptor_ef7750073d18011b = []byte{
-	// 2272 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6e, 0xdb, 0xc8,
-	0x15, 0xb6, 0xfe, 0x2c, 0xe9, 0xc8, 0x92, 0xe8, 0x49, 0xec, 0x25, 0x1c, 0xef, 0xc6, 0xe0, 0x66,
-	0x17, 0x4e, 0xb0, 0xeb, 0x6c, 0x92, 0xee, 0x36, 0xb9, 0x94, 0x25, 0x5a, 0xe1, 0x5a, 0x26, 0x89,
-	0xa1, 0xe4, 0x20, 0xed, 0x85, 0x40, 0x93, 0x63, 0x99, 0x28, 0x45, 0x2a, 0x24, 0x65, 0xd7, 0x0f,
-	0xd0, 0x67, 0xe8, 0xe5, 0x02, 0x7d, 0x80, 0xbe, 0x47, 0xef, 0x7a, 0x5f, 0xa0, 0x77, 0x7d, 0x8e,
-	0x16, 0x33, 0x1c, 0x52, 0xa4, 0x24, 0x3b, 0xce, 0x55, 0x6f, 0x0c, 0x9e, 0xef, 0xfc, 0xcc, 0x99,
-	0xf3, 0x33, 0x73, 0x46, 0x86, 0x1d, 0x73, 0xe6, 0xbc, 0xbc, 0xb8, 0x08, 0x9d, 0x69, 0xfc, 0xf7,
-	0x68, 0x16, 0xf8, 0x91, 0x8f, 0x2a, 0x8c, 0xd8, 0x7b, 0x72, 0xed, 0xbb, 0xd1, 0x95, 0x39, 0x66,
-	0x60, 0xf8, 0xd2, 0x9f, 0x11, 0xcf, 0x77, 0xa3, 0x58, 0x66, 0xef, 0x20, 0xcf, 0x8c, 0x88, 0x75,
-	0x45, 0xbf, 0x2f, 0x1d, 0x97, 0xc4, 0x12, 0xd2, 0x7f, 0x8b, 0x50, 0xd5, 0x35, 0x55, 0xf7, 0x83,
-	0x08, 0xb5, 0xa0, 0xa8, 0xf4, 0xc4, 0xc2, 0x41, 0xe1, 0xb0, 0x82, 0x8b, 0x4a, 0x0f, 0xed, 0x43,
-	0x5d, 0x9b, 0x91, 0xc0, 0x88, 0xcc, 0x88, 0x88, 0xc5, 0x83, 0xc2, 0x61, 0x1d, 0x2f, 0x00, 0xf4,
-	0x0c, 0x9a, 0x8a, 0x17, 0x91, 0xc0, 0x33, 0xdd, 0x58, 0xa2, 0xc4, 0x24, 0xf2, 0x20, 0x3a, 0x80,
-	0x86, 0x6e, 0x5a, 0x7f, 0x22, 0x51, 0xd7, 0x9f, 0x7b, 0x91, 0x58, 0x3e, 0x28, 0x1c, 0x96, 0x71,
-	0x16, 0x42, 0x27, 0xd0, 0xee, 0xb8, 0xae, 0x6f, 0x99, 0x11, 0xb1, 0x35, 0x6f, 0xae, 0xd8, 0xa1,
-	0x58, 0x39, 0x28, 0x1d, 0x36, 0x5e, 0xef, 0x1f, 0xc5, 0xdb, 0xd5, 0x7d, 0x2f, 0x15, 0xc0, 0x24,
-	0xf4, 0xe7, 0x81, 0x45, 0x42, 0xbc, 0xac, 0x84, 0x7e, 0x85, 0xed, 0x14, 0xea, 0x93, 0x29, 0xdd,
-	0x51, 0x28, 0x6e, 0x3e, 0xc0, 0xd2, 0xaa, 0x5a, 0xce, 0x16, 0xfb, 0xa0, 0x5e, 0x55, 0xbf, 0xc8,
-	0x56, 0xa2, 0x86, 0xbe, 0x01, 0x18, 0x12, 0xeb, 0xca, 0xf3, 0x5d, 0x7f, 0x72, 0x2b, 0xd6, 0x58,
-	0x90, 0x32, 0x88, 0x74, 0x0a, 0x3b, 0x6b, 0x6d, 0x21, 0x09, 0xb6, 0x0c, 0x12, 0x38, 0xa6, 0xab,
-	0xce, 0xa7, 0x17, 0x24, 0x60, 0x89, 0xa9, 0xe3, 0x1c, 0xc6, 0x52, 0x66, 0xb3, 0xdc, 0xd0, 0x94,
-	0xd9, 0xd2, 0xef, 0xa1, 0xaa, 0xaa, 0xca, 0x97, 0x67, 0x53, 0xfa, 0x4f, 0x01, 0x4a, 0x9a, 0xbb,
-	0xaa, 0xb5, 0xec, 0x44, 0x71, 0x8d, 0x13, 0x39, 0xcb, 0xa5, 0xcf, 0xd6, 0x49, 0x79, 0x5d, 0x9d,
-	0xd0, 0x75, 0x75, 0xb1, 0xca, 0x58, 0x45, 0x45, 0x47, 0x2f, 0xa0, 0xc6, 0x37, 0x92, 0x94, 0x43,
-	0x8b, 0x07, 0x9e, 0xc3, 0x38, 0xe5, 0x53, 0x59, 0x5e, 0xc2, 0x49, 0xc2, 0x13, 0x59, 0x0e, 0xe3,
-	0x94, 0x2f, 0xfd, 0xa5, 0x00, 0xa2, 0xe6, 0x46, 0x2b, 0xe1, 0x1e, 0xde, 0xce, 0x08, 0x7a, 0x0b,
-	0xe5, 0xe8, 0x76, 0x46, 0xd8, 0xf6, 0x5b, 0xaf, 0x9f, 0x71, 0x23, 0x77, 0x89, 0x1f, 0xd1, 0x3f,
-	0x98, 0x69, 0x48, 0x2f, 0xa1, 0xcc, 0x2c, 0x34, 0xa0, 0x3a, 0x52, 0x4f, 0x55, 0xed, 0x83, 0x2a,
-	0x6c, 0xa0, 0x2d, 0xa8, 0x75, 0x06, 0x03, 0xad, 0x3b, 0x56, 0x7a, 0x42, 0x81, 0x52, 0x7d, 0xf9,
-	0x6c, 0xac, 0x6b, 0x78, 0x28, 0x14, 0xa5, 0xbf, 0x17, 0xe0, 0xf1, 0x3a, 0xc3, 0x08, 0xc5, 0x96,
-	0x78, 0xb6, 0x63, 0xab, 0xfb, 0x50, 0xd7, 0x7d, 0x8f, 0x6e, 0x80, 0x27, 0xbb, 0x89, 0x17, 0x00,
-	0x7a, 0x0c, 0x15, 0xd6, 0x02, 0x2c, 0xf4, 0x4d, 0x1c, 0x13, 0x68, 0x17, 0x36, 0x29, 0x5f, 0xf5,
-	0x59, 0xbc, 0x9b, 0x98, 0x53, 0xb4, 0x1c, 0x93, 0xb5, 0x14, 0x5b, 0xac, 0xb0, 0x44, 0x67, 0x10,
-	0xaa, 0x77, 0xe2, 0xfa, 0x37, 0x8a, 0x2d, 0x6e, 0xb2, 0x5e, 0xe5, 0x94, 0x84, 0x61, 0x67, 0x9d,
-	0xbf, 0x21, 0x7a, 0x07, 0xf5, 0x20, 0x21, 0xc4, 0x02, 0x0b, 0xff, 0x93, 0x7b, 0x22, 0x87, 0x17,
-	0xd2, 0xd2, 0x6f, 0x65, 0x28, 0x69, 0xea, 0xe8, 0xff, 0x56, 0x74, 0x99, 0xb8, 0xf6, 0x78, 0x28,
-	0x16, 0x00, 0x3a, 0x80, 0xfa, 0xfb, 0x9b, 0x8e, 0x6d, 0x07, 0x24, 0x0c, 0xe3, 0xbe, 0x3d, 0x2e,
-	0x8a, 0x05, 0xbc, 0x00, 0xd1, 0x5e, 0x1a, 0xe3, 0x3a, 0x55, 0x66, 0xec, 0x24, 0xce, 0x47, 0x50,
-	0x0b, 0x49, 0x70, 0xed, 0xd0, 0xa8, 0x40, 0xae, 0x28, 0x8d, 0x18, 0x66, 0xd2, 0xa9, 0x0c, 0xea,
-	0xc1, 0xd7, 0xca, 0xd4, 0x9c, 0x10, 0xc3, 0xbf, 0x8c, 0x6e, 0xcc, 0x80, 0xc8, 0x7f, 0x9e, 0x11,
-	0x2b, 0x22, 0xb6, 0x41, 0xac, 0xc8, 0xf1, 0xbd, 0x50, 0x6c, 0x30, 0xff, 0xee, 0x17, 0x5a, 0xb1,
-	0x82, 0x89, 0x45, 0x9c, 0xeb, 0x8c, 0x95, 0xad, 0x35, 0x56, 0x96, 0x85, 0xd0, 0x4f, 0xf0, 0xa8,
-	0x63, 0x45, 0xce, 0x35, 0x61, 0x62, 0xb2, 0x17, 0x39, 0xd1, 0xad, 0x62, 0x8b, 0x4d, 0xa6, 0xbb,
-	0x8e, 0x85, 0x7e, 0x81, 0xdd, 0xae, 0x3f, 0x9d, 0x3a, 0x51, 0x44, 0xec, 0xbc, 0x52, 0x8b, 0x29,
-	0xdd, 0xc1, 0x45, 0xdf, 0x40, 0x79, 0xee, 0x39, 0xa1, 0xd8, 0x66, 0x11, 0x02, 0x1e, 0xa1, 0x91,
-	0xaa, 0x60, 0x86, 0x4b, 0xff, 0x2a, 0x40, 0x69, 0xa4, 0x2a, 0x2b, 0x15, 0xc2, 0x6b, 0xbe, 0xc7,
-	0x8f, 0xbe, 0x98, 0xe0, 0xa8, 0xe1, 0xf1, 0x7a, 0x88, 0x09, 0xda, 0x51, 0x67, 0x44, 0xe9, 0xf1,
-	0x3e, 0x60, 0xdf, 0xf9, 0xea, 0xa9, 0x2c, 0x57, 0xcf, 0xa2, 0x77, 0x36, 0x99, 0xf9, 0x24, 0xa7,
-	0x2f, 0x32, 0x39, 0xad, 0xae, 0xcb, 0x69, 0x26, 0x9f, 0x12, 0xef, 0xe3, 0x1a, 0x3b, 0x4b, 0x12,
-	0xb9, 0x91, 0xe7, 0xc4, 0xa7, 0x06, 0xfd, 0x2b, 0xfd, 0xa3, 0x02, 0x55, 0xae, 0x49, 0xbd, 0x54,
-	0xcd, 0x69, 0xda, 0xf7, 0xf4, 0x9b, 0x7a, 0xb9, 0xa8, 0x40, 0x7e, 0x64, 0x2f, 0xaa, 0xef, 0xce,
-	0xdd, 0x1a, 0x43, 0x73, 0xc2, 0x76, 0x5b, 0xc1, 0xec, 0x9b, 0x62, 0x5d, 0x8a, 0xc5, 0x25, 0xce,
-	0xbe, 0xe9, 0x39, 0xa0, 0x12, 0x62, 0x87, 0xb2, 0x39, 0xf3, 0x5d, 0xb6, 0xcf, 0x1a, 0xce, 0x20,
-	0x74, 0x6d, 0x46, 0xf5, 0xae, 0xac, 0x19, 0x3b, 0x97, 0x6b, 0x78, 0x01, 0xa4, 0x5c, 0x65, 0x32,
-	0x9d, 0xb1, 0x2d, 0x26, 0x5c, 0x0a, 0x20, 0x11, 0xaa, 0xfc, 0x2a, 0x8d, 0x1b, 0x03, 0x27, 0x24,
-	0x5d, 0x95, 0x99, 0x8f, 0x03, 0x0f, 0xf1, 0x65, 0xb8, 0x40, 0xa8, 0x5d, 0x6a, 0x3f, 0x66, 0x37,
-	0xe2, 0x1d, 0xa7, 0xc0, 0x6a, 0x57, 0x6f, 0xdd, 0xd1, 0xd5, 0x4a, 0xff, 0x4c, 0x8f, 0x25, 0x9a,
-	0xb1, 0x8d, 0x14, 0xa0, 0x51, 0x1b, 0x79, 0x0e, 0x2f, 0xcc, 0x26, 0x8e, 0x09, 0x3a, 0xa6, 0xd0,
-	0xd4, 0x98, 0x93, 0x33, 0x33, 0xb2, 0xae, 0xc4, 0x36, 0xf3, 0x3a, 0x0b, 0xa1, 0xef, 0xa1, 0x35,
-	0x0a, 0x69, 0xe4, 0xf4, 0xc0, 0xf1, 0x03, 0x27, 0xba, 0x15, 0x05, 0x66, 0x60, 0x09, 0x8d, 0xe5,
-	0x8c, 0xac, 0xdc, 0x76, 0x22, 0x67, 0x2c, 0xc9, 0xf5, 0xf2, 0xf6, 0x50, 0x2c, 0xd7, 0x5b, 0xb1,
-	0xd7, 0xcb, 0xdb, 0x7b, 0x94, 0xc8, 0xe5, 0xec, 0x25, 0xf9, 0xd4, 0x75, 0xdd, 0x97, 0xc5, 0xc7,
-	0x99, 0x7c, 0x32, 0x84, 0xf6, 0x74, 0xd7, 0xf7, 0x2e, 0x9d, 0xc9, 0x3c, 0x20, 0x67, 0xa6, 0x95,
-	0x54, 0xd5, 0x0e, 0x13, 0x5c, 0xc7, 0x42, 0x3f, 0xc0, 0xb6, 0xec, 0x99, 0x17, 0x2e, 0xc5, 0x06,
-	0xc4, 0x0c, 0x3c, 0xc7, 0x9b, 0x88, 0xbb, 0x4c, 0x7e, 0x95, 0x21, 0x99, 0xf0, 0x58, 0x53, 0x47,
-	0xc3, 0xc0, 0xbc, 0xbc, 0x74, 0x2c, 0xc3, 0xba, 0x22, 0xf6, 0xdc, 0x25, 0x41, 0x88, 0x14, 0x68,
-	0x47, 0x14, 0x5c, 0x40, 0xac, 0xc4, 0x1b, 0xaf, 0x9f, 0x1e, 0xe5, 0xc6, 0xd1, 0x15, 0x4d, 0xbc,
-	0xac, 0x27, 0x1d, 0x42, 0x59, 0x53, 0x47, 0x21, 0x3a, 0x80, 0x8a, 0x13, 0x91, 0x69, 0x72, 0xdb,
-	0x24, 0xa7, 0x86, 0xa6, 0x8e, 0x70, 0xcc, 0x90, 0x7e, 0x82, 0x9a, 0x91, 0x34, 0xe2, 0xb3, 0xbc,
-	0xf4, 0x72, 0xc7, 0x72, 0x8d, 0x43, 0x28, 0x8f, 0x54, 0xe5, 0x4e, 0xdb, 0xf4, 0x44, 0x4a, 0x6d,
-	0x03, 0x5d, 0x89, 0x7c, 0x9a, 0x93, 0x30, 0x7a, 0xc8, 0x90, 0x26, 0xbd, 0x00, 0xd0, 0x35, 0x35,
-	0xd1, 0xc8, 0x5d, 0xe6, 0x85, 0xa5, 0xcb, 0x5c, 0x1a, 0x00, 0xd0, 0xb5, 0xb8, 0xec, 0x21, 0xb4,
-	0x69, 0x57, 0xaf, 0x2e, 0xb0, 0x0c, 0x27, 0x65, 0xdd, 0xe3, 0xc7, 0x44, 0x4c, 0x48, 0xff, 0x2e,
-	0x41, 0xbd, 0xe3, 0x9a, 0xc1, 0x94, 0x1d, 0x37, 0xff, 0x2c, 0x41, 0x85, 0x7e, 0x84, 0xa8, 0x0a,
-	0xa5, 0x81, 0x66, 0x08, 0x1b, 0xa8, 0x05, 0xd0, 0xfb, 0xa8, 0xa8, 0xfd, 0x71, 0xbf, 0x63, 0xe8,
-	0x42, 0x01, 0x35, 0xa1, 0xae, 0xa9, 0xa3, 0x71, 0x67, 0xd0, 0xc1, 0x67, 0x42, 0x11, 0x7d, 0x05,
-	0x8f, 0x28, 0x69, 0x0c, 0x3b, 0x78, 0x38, 0xd2, 0xc7, 0x27, 0x1d, 0x65, 0x30, 0xc2, 0xb2, 0x50,
-	0x42, 0xbb, 0x80, 0x18, 0x43, 0xe9, 0xab, 0x9d, 0xc1, 0xb8, 0x27, 0xf7, 0x71, 0xa7, 0x27, 0x0b,
-	0xe5, 0x44, 0xa1, 0x87, 0x95, 0x93, 0xe1, 0x58, 0x3b, 0x19, 0x7f, 0x50, 0xd4, 0x9e, 0xf6, 0x41,
-	0xa8, 0xa0, 0x7d, 0x10, 0x29, 0x63, 0xa0, 0x19, 0x06, 0xc5, 0xb5, 0xb3, 0xae, 0x32, 0xee, 0xbe,
-	0xef, 0xa8, 0xaa, 0x3c, 0x10, 0x36, 0xd3, 0x75, 0x98, 0x39, 0x23, 0x5d, 0xa7, 0x8a, 0x9e, 0xc3,
-	0x77, 0x94, 0x31, 0xc4, 0x1d, 0xd5, 0x38, 0x53, 0x0c, 0x43, 0xd1, 0xd4, 0xb1, 0xa2, 0x0e, 0x65,
-	0x7c, 0x22, 0x63, 0x59, 0xed, 0xca, 0xe3, 0x0f, 0x1d, 0xac, 0x2a, 0x6a, 0x5f, 0xa8, 0xa1, 0x3d,
-	0xd8, 0x65, 0xae, 0x77, 0x87, 0xca, 0x79, 0x67, 0x48, 0x05, 0x13, 0x33, 0x75, 0x24, 0xb2, 0xe2,
-	0x1c, 0xeb, 0x58, 0xeb, 0xca, 0x86, 0x41, 0xf7, 0x2b, 0x63, 0xac, 0x61, 0x01, 0xd0, 0x01, 0xec,
-	0x67, 0xfd, 0x3a, 0x95, 0x3f, 0x8e, 0x8d, 0x8f, 0x6a, 0x37, 0xd5, 0x6d, 0xa0, 0x1d, 0xd8, 0xa6,
-	0x12, 0xca, 0x70, 0x34, 0xd6, 0x35, 0x95, 0xc6, 0x62, 0x68, 0x08, 0x5b, 0x68, 0x1b, 0x9a, 0x69,
-	0xa4, 0xa8, 0xba, 0xd0, 0x5c, 0x86, 0x8e, 0x85, 0x56, 0xb2, 0xb1, 0x04, 0xd2, 0xbb, 0x63, 0xba,
-	0x0b, 0xa1, 0x9d, 0xc4, 0x23, 0xc7, 0xe8, 0x72, 0xaf, 0x04, 0x84, 0xa0, 0x95, 0xe5, 0x9e, 0x28,
-	0xc2, 0x36, 0x7a, 0x04, 0xed, 0x2c, 0xd6, 0x39, 0x53, 0x04, 0x24, 0xbd, 0x85, 0x16, 0xcb, 0xaf,
-	0x6e, 0x06, 0xe6, 0x94, 0x44, 0x24, 0x40, 0x02, 0x94, 0x4e, 0xc9, 0x2d, 0x2f, 0x13, 0xfa, 0x49,
-	0x4b, 0xe3, 0xdc, 0x74, 0xe7, 0xc9, 0xd0, 0x1f, 0x13, 0xd2, 0xdf, 0x0a, 0xcc, 0x1e, 0xd3, 0xce,
-	0x94, 0x66, 0x5a, 0x2d, 0xdc, 0xc2, 0x02, 0x78, 0xd0, 0x54, 0xb6, 0x0b, 0x9b, 0xf4, 0x98, 0x9d,
-	0x87, 0xfc, 0x52, 0xe2, 0x14, 0xfa, 0x19, 0x20, 0x75, 0x31, 0x14, 0xcb, 0xac, 0xb7, 0x76, 0x78,
-	0x6f, 0xe5, 0x37, 0x80, 0x33, 0x82, 0xd2, 0x27, 0x68, 0x6b, 0x83, 0x61, 0xce, 0xc7, 0x03, 0x68,
-	0xb0, 0xe3, 0xfe, 0xd2, 0xb4, 0x08, 0x1f, 0x09, 0x9a, 0x38, 0x0b, 0xa5, 0xb7, 0x04, 0x25, 0xd9,
-	0x4e, 0x8a, 0x99, 0x5b, 0x22, 0x01, 0xef, 0xf2, 0x94, 0x3e, 0x10, 0x9a, 0xe7, 0x24, 0x08, 0x1d,
-	0xdf, 0xe3, 0x7b, 0x12, 0xa1, 0x7a, 0x1d, 0x03, 0x3c, 0x26, 0x09, 0x49, 0xe3, 0x75, 0x31, 0x77,
-	0x5c, 0x7b, 0xe8, 0x4c, 0xd3, 0x27, 0x55, 0x0a, 0xd0, 0x13, 0xd9, 0x62, 0x53, 0xcf, 0x7b, 0x33,
-	0xbc, 0xe2, 0xab, 0x64, 0x10, 0xaa, 0x3d, 0x71, 0x22, 0xee, 0x44, 0x3c, 0x9f, 0x2e, 0x00, 0xe9,
-	0x2d, 0xd4, 0x06, 0xfe, 0x64, 0x40, 0xae, 0x89, 0x4b, 0x33, 0xe8, 0xd2, 0x0f, 0xbe, 0x7e, 0x4c,
-	0xd0, 0x1d, 0x58, 0xa6, 0xeb, 0xf2, 0x4c, 0xd4, 0x30, 0xa7, 0x24, 0x19, 0x6a, 0x98, 0x84, 0x33,
-	0xdf, 0x0b, 0x09, 0x7a, 0x0a, 0x8d, 0x90, 0xd9, 0x1b, 0x5b, 0xbe, 0x4d, 0xf8, 0x00, 0x05, 0x31,
-	0xd4, 0xf5, 0x6d, 0x42, 0x37, 0x37, 0x25, 0x61, 0x68, 0x4e, 0x92, 0x0d, 0x24, 0xa4, 0xf4, 0xd7,
-	0x02, 0x34, 0xe8, 0x6d, 0x9e, 0x04, 0xfe, 0x39, 0x6c, 0x6a, 0xde, 0x1c, 0x93, 0x4f, 0xfc, 0xfc,
-	0xde, 0xce, 0x1c, 0xbb, 0xb1, 0x08, 0xe6, 0x02, 0xe8, 0x1d, 0x6c, 0x19, 0xf3, 0x8b, 0x0e, 0x9b,
-	0x26, 0xcf, 0x4d, 0x97, 0x59, 0x6e, 0xa5, 0xf9, 0x4e, 0x59, 0xec, 0x2c, 0xc2, 0x39, 0x51, 0x5a,
-	0x64, 0xfd, 0xc0, 0x9f, 0xcf, 0x92, 0xfb, 0x29, 0x0e, 0x5b, 0x0e, 0x93, 0x4e, 0xa1, 0x42, 0x1f,
-	0x25, 0x21, 0xfa, 0x1a, 0xe0, 0xd2, 0xf5, 0x6f, 0xc6, 0x16, 0xfb, 0x6d, 0x81, 0x9f, 0xa5, 0x14,
-	0x89, 0x7f, 0x59, 0xf8, 0x16, 0x2a, 0x94, 0xa0, 0xa3, 0x13, 0xad, 0xb7, 0xe6, 0x51, 0xf2, 0xe3,
-	0x08, 0xd5, 0xc6, 0x31, 0x4f, 0x7a, 0x0a, 0x55, 0x9a, 0x2d, 0x7f, 0x1e, 0xd1, 0x30, 0xdb, 0xc4,
-	0x35, 0x6f, 0xb9, 0xa5, 0x98, 0x90, 0xaa, 0x50, 0x91, 0xa7, 0xb3, 0xe8, 0xf6, 0xc5, 0x3e, 0x54,
-	0xf9, 0xf8, 0x46, 0xcf, 0x4f, 0x79, 0xf8, 0x5e, 0xd8, 0x40, 0x35, 0x28, 0xeb, 0xda, 0xd0, 0x10,
-	0x0a, 0x2f, 0x5e, 0x41, 0x2b, 0xbf, 0x31, 0xca, 0xfb, 0x55, 0x53, 0xe8, 0x43, 0xb0, 0x0e, 0x95,
-	0x81, 0xdc, 0x39, 0x97, 0x85, 0x02, 0x02, 0xd8, 0xa4, 0xe0, 0xf9, 0x1b, 0xa1, 0xf8, 0xfa, 0xb7,
-	0x2d, 0xa8, 0x1c, 0x1f, 0x1b, 0xce, 0x14, 0xbd, 0x84, 0x2a, 0xaf, 0x39, 0xb4, 0xc5, 0xa3, 0xc4,
-	0xd6, 0xdc, 0x7b, 0xcc, 0xa9, 0x5c, 0x45, 0x4a, 0x1b, 0xe8, 0x15, 0x34, 0x0c, 0x12, 0xa5, 0x05,
-	0xd2, 0xe6, 0x62, 0x09, 0xb0, 0xb7, 0x0c, 0x48, 0x1b, 0xe8, 0x19, 0x6c, 0xf6, 0x49, 0x44, 0xdf,
-	0xf8, 0xf9, 0x25, 0x60, 0xf1, 0x58, 0x93, 0x36, 0xd0, 0x1f, 0x41, 0x8c, 0xa5, 0xd6, 0xbc, 0xf4,
-	0x9e, 0x7e, 0xe6, 0x41, 0xbc, 0xb7, 0x7f, 0x8f, 0x40, 0x28, 0x6d, 0xa0, 0x1f, 0x01, 0x74, 0xff,
-	0x86, 0x04, 0xbe, 0xb7, 0xea, 0x46, 0xe2, 0x71, 0x52, 0xba, 0xd2, 0x06, 0x3a, 0x82, 0x86, 0x71,
-	0x35, 0x8f, 0x6c, 0xff, 0xe6, 0x61, 0xf2, 0x3f, 0x40, 0x1d, 0x93, 0x0b, 0xdf, 0x8f, 0x1e, 0x24,
-	0x4d, 0x13, 0x16, 0xf9, 0xb3, 0x09, 0xd6, 0xbb, 0x74, 0x16, 0x20, 0xc1, 0xe7, 0x55, 0x5e, 0x43,
-	0xdb, 0x88, 0xcc, 0x20, 0xfa, 0x12, 0x9d, 0x5f, 0x60, 0x1b, 0x93, 0x70, 0x49, 0x2b, 0x19, 0x42,
-	0x78, 0xe5, 0xad, 0xd3, 0x7b, 0x1e, 0xa7, 0x4b, 0x1d, 0xa1, 0xd5, 0x46, 0xdb, 0xcb, 0x8c, 0x3c,
-	0xd2, 0x06, 0xfa, 0x9e, 0x8e, 0xdb, 0x11, 0x1b, 0x8d, 0xf2, 0xee, 0x34, 0x16, 0x62, 0x34, 0xfc,
-	0x6f, 0xa0, 0xd1, 0x27, 0x51, 0x3a, 0x18, 0x6d, 0x67, 0x66, 0x1b, 0x6e, 0xb7, 0x9d, 0x1f, 0x8e,
-	0x42, 0x96, 0x04, 0xa0, 0xc6, 0xbd, 0xf9, 0xc8, 0x73, 0xc2, 0x75, 0xbe, 0x34, 0x16, 0x66, 0xf8,
-	0x22, 0x69, 0xd2, 0xd6, 0x3b, 0x7f, 0x47, 0x60, 0xb9, 0x52, 0xc7, 0x75, 0xd7, 0xec, 0x64, 0x8d,
-	0xce, 0x3b, 0xd8, 0xce, 0x2c, 0x14, 0x6a, 0x9e, 0xae, 0xa9, 0xe9, 0x72, 0x8b, 0x79, 0x6b, 0xfd,
-	0x72, 0x69, 0x1d, 0x3e, 0xd8, 0xc5, 0x57, 0xd0, 0xe2, 0x3a, 0x0f, 0xf6, 0xf0, 0x2d, 0x08, 0x8b,
-	0x65, 0xbe, 0xc8, 0xc1, 0xdf, 0xc1, 0x16, 0x2f, 0x9a, 0xf8, 0x31, 0x76, 0x4f, 0xaa, 0x32, 0x5a,
-	0x6f, 0xa0, 0xc1, 0xb5, 0xd8, 0x1b, 0xed, 0x61, 0x4a, 0xc7, 0xb0, 0x63, 0xb0, 0xfc, 0xb2, 0x5b,
-	0x56, 0xf1, 0x6c, 0xc7, 0x32, 0xe9, 0x19, 0x86, 0x76, 0x17, 0x61, 0xc9, 0x5e, 0xc0, 0xf7, 0xd8,
-	0xa0, 0x5d, 0x7f, 0x87, 0x8d, 0xfc, 0x25, 0xbe, 0xce, 0xc6, 0x8f, 0x50, 0xeb, 0x93, 0x28, 0x3e,
-	0xd7, 0xd7, 0x64, 0x24, 0x09, 0x36, 0x13, 0x60, 0xb1, 0x6d, 0x77, 0xaf, 0x4c, 0x6f, 0x42, 0xe8,
-	0x15, 0x15, 0xbf, 0xec, 0x10, 0x17, 0xc9, 0x5c, 0x5a, 0xeb, 0x16, 0x3a, 0x85, 0xaf, 0xe2, 0x82,
-	0x5e, 0x7d, 0xab, 0xac, 0x59, 0xf7, 0xc9, 0x02, 0x5a, 0x91, 0x4f, 0x5b, 0x8f, 0xb5, 0xc6, 0xfa,
-	0xd6, 0xe3, 0x5d, 0xf1, 0x33, 0x9d, 0x49, 0xae, 0x4d, 0xd7, 0xb1, 0xcd, 0x88, 0x9c, 0xd9, 0xe1,
-	0xc3, 0x8a, 0xee, 0xf8, 0xbb, 0x3f, 0x7c, 0x3b, 0x71, 0xa2, 0xab, 0xf9, 0xc5, 0x91, 0xe5, 0x4f,
-	0xd9, 0x6f, 0xfb, 0x96, 0x1f, 0xd8, 0xfc, 0x9f, 0x01, 0xe9, 0xbf, 0x05, 0x2e, 0x36, 0xd9, 0x6f,
-	0xf9, 0x6f, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x64, 0x8c, 0x7f, 0x2a, 0x18, 0x00, 0x00,
+	// 2290 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x6f, 0xdb, 0xc8,
+	0x15, 0xb7, 0xfe, 0x59, 0xd2, 0x93, 0x25, 0xd1, 0x93, 0xd8, 0x4b, 0x38, 0xde, 0x8d, 0xc1, 0xcd,
+	0x2e, 0x9c, 0x60, 0xd7, 0xd9, 0x24, 0xdd, 0x6d, 0x72, 0x94, 0x25, 0x5a, 0xe1, 0x5a, 0x26, 0x89,
+	0xa1, 0xe4, 0x20, 0xed, 0x41, 0xa0, 0xc9, 0xb1, 0x4c, 0x94, 0x22, 0x15, 0x92, 0xb2, 0xeb, 0x0f,
+	0xd0, 0x63, 0xcf, 0x3d, 0x2e, 0xd0, 0x0f, 0xd0, 0xef, 0xd1, 0x5b, 0xef, 0x05, 0xfa, 0x55, 0x5a,
+	0xcc, 0x70, 0x48, 0x91, 0x92, 0xec, 0x38, 0xa7, 0x5e, 0x0c, 0xbe, 0xdf, 0xfb, 0x33, 0x6f, 0xde,
+	0x9f, 0x99, 0x37, 0x32, 0xec, 0x98, 0x33, 0xe7, 0xe5, 0xc5, 0x45, 0xe8, 0x4c, 0xe3, 0xbf, 0x47,
+	0xb3, 0xc0, 0x8f, 0x7c, 0x54, 0x61, 0xc4, 0xde, 0x93, 0x6b, 0xdf, 0x8d, 0xae, 0xcc, 0x31, 0x03,
+	0xc3, 0x97, 0xfe, 0x8c, 0x78, 0xbe, 0x1b, 0xc5, 0x32, 0x7b, 0x07, 0x79, 0x66, 0x44, 0xac, 0x2b,
+	0xfa, 0x7d, 0xe9, 0xb8, 0x24, 0x96, 0x90, 0xfe, 0x5b, 0x84, 0xaa, 0xae, 0xa9, 0xba, 0x1f, 0x44,
+	0xa8, 0x05, 0x45, 0xa5, 0x27, 0x16, 0x0e, 0x0a, 0x87, 0x15, 0x5c, 0x54, 0x7a, 0x68, 0x1f, 0xea,
+	0xda, 0x8c, 0x04, 0x46, 0x64, 0x46, 0x44, 0x2c, 0x1e, 0x14, 0x0e, 0xeb, 0x78, 0x01, 0xa0, 0x67,
+	0xd0, 0x54, 0xbc, 0x88, 0x04, 0x9e, 0xe9, 0xc6, 0x12, 0x25, 0x26, 0x91, 0x07, 0xd1, 0x01, 0x34,
+	0x74, 0xd3, 0xfa, 0x13, 0x89, 0xba, 0xfe, 0xdc, 0x8b, 0xc4, 0xf2, 0x41, 0xe1, 0xb0, 0x8c, 0xb3,
+	0x10, 0x3a, 0x81, 0x76, 0xc7, 0x75, 0x7d, 0xcb, 0x8c, 0x88, 0xad, 0x79, 0x73, 0xc5, 0x0e, 0xc5,
+	0xca, 0x41, 0xe9, 0xb0, 0xf1, 0x7a, 0xff, 0x28, 0xde, 0xae, 0xee, 0x7b, 0xa9, 0x00, 0x26, 0xa1,
+	0x3f, 0x0f, 0x2c, 0x12, 0xe2, 0x65, 0x25, 0xf4, 0x2b, 0x6c, 0xa7, 0x50, 0x9f, 0x4c, 0xe9, 0x8e,
+	0x42, 0x71, 0xf3, 0x01, 0x96, 0x56, 0xd5, 0x72, 0xb6, 0xd8, 0x07, 0xf5, 0xaa, 0xfa, 0x45, 0xb6,
+	0x12, 0x35, 0xf4, 0x0d, 0xc0, 0x90, 0x58, 0x57, 0x9e, 0xef, 0xfa, 0x93, 0x5b, 0xb1, 0xc6, 0x82,
+	0x94, 0x41, 0xa4, 0x53, 0xd8, 0x59, 0x6b, 0x0b, 0x49, 0xb0, 0x65, 0x90, 0xc0, 0x31, 0x5d, 0x75,
+	0x3e, 0xbd, 0x20, 0x01, 0x4b, 0x4c, 0x1d, 0xe7, 0x30, 0x96, 0x32, 0x9b, 0xe5, 0x86, 0xa6, 0xcc,
+	0x96, 0x7e, 0x0f, 0x55, 0x55, 0x55, 0xbe, 0x3c, 0x9b, 0xd2, 0x5f, 0x8b, 0x50, 0xd2, 0xdc, 0x55,
+	0xad, 0x65, 0x27, 0x8a, 0x6b, 0x9c, 0xc8, 0x59, 0x2e, 0x7d, 0xb6, 0x4e, 0xca, 0xeb, 0xea, 0x84,
+	0xae, 0xab, 0x8b, 0x55, 0xc6, 0x2a, 0x2a, 0x3a, 0x7a, 0x01, 0x35, 0xbe, 0x91, 0xa4, 0x1c, 0x5a,
+	0x3c, 0xf0, 0x1c, 0xc6, 0x29, 0x9f, 0xca, 0xf2, 0x12, 0x4e, 0x12, 0x9e, 0xc8, 0x72, 0x18, 0xa7,
+	0x7c, 0xf4, 0x3d, 0xb4, 0x54, 0xcf, 0xe9, 0x5d, 0x59, 0xb3, 0x61, 0x60, 0xce, 0xce, 0x1d, 0x9b,
+	0x65, 0xa4, 0x82, 0x97, 0x50, 0xe9, 0x2f, 0x05, 0x10, 0x35, 0x37, 0x5a, 0x49, 0xcb, 0xf0, 0x76,
+	0x46, 0xd0, 0x5b, 0x28, 0x47, 0xb7, 0x33, 0xc2, 0xc2, 0xd4, 0x7a, 0xfd, 0x8c, 0x2f, 0x76, 0x97,
+	0xf8, 0x11, 0xfd, 0x83, 0x99, 0x86, 0xf4, 0x12, 0xca, 0xcc, 0x42, 0x03, 0xaa, 0x23, 0xf5, 0x54,
+	0xd5, 0x3e, 0xa8, 0xc2, 0x06, 0xda, 0x82, 0x5a, 0x67, 0x30, 0xd0, 0xba, 0x63, 0xa5, 0x27, 0x14,
+	0x28, 0xd5, 0x97, 0xcf, 0xc6, 0xba, 0x86, 0x87, 0x42, 0x51, 0xfa, 0x47, 0x01, 0x1e, 0xaf, 0x33,
+	0x8c, 0x50, 0x6c, 0x89, 0x57, 0x45, 0x6c, 0x75, 0x1f, 0xea, 0xba, 0xef, 0xd1, 0x8d, 0xf2, 0xa2,
+	0x68, 0xe2, 0x05, 0x80, 0x1e, 0x43, 0x85, 0xb5, 0x0a, 0x4b, 0x51, 0x13, 0xc7, 0x04, 0xda, 0x85,
+	0x4d, 0xca, 0x57, 0x7d, 0x96, 0x97, 0x26, 0xe6, 0x14, 0x2d, 0xdb, 0x64, 0x2d, 0xc5, 0x16, 0x2b,
+	0x2c, 0x48, 0x19, 0x84, 0xea, 0x9d, 0xb8, 0xfe, 0x8d, 0x62, 0x8b, 0x9b, 0xac, 0xa7, 0x39, 0x25,
+	0x61, 0xd8, 0x59, 0xe7, 0x6f, 0x88, 0xde, 0x41, 0x3d, 0x48, 0x08, 0xb1, 0xc0, 0xd2, 0xf4, 0xe4,
+	0x9e, 0xc8, 0xe1, 0x85, 0xb4, 0xf4, 0x5b, 0x19, 0x4a, 0x9a, 0x3a, 0xfa, 0xbf, 0x15, 0x67, 0x26,
+	0xae, 0x3d, 0x1e, 0x8a, 0x05, 0x80, 0x0e, 0xa0, 0xfe, 0xfe, 0xa6, 0x63, 0xdb, 0x01, 0x09, 0xc3,
+	0xb8, 0xbf, 0x8f, 0x8b, 0x62, 0x01, 0x2f, 0x40, 0xb4, 0x97, 0xc6, 0xb8, 0x4e, 0x95, 0x19, 0x3b,
+	0x89, 0xf3, 0x11, 0xd4, 0x42, 0x12, 0x5c, 0x3b, 0x34, 0x2a, 0x90, 0x2b, 0x5e, 0x23, 0x86, 0x99,
+	0x74, 0x2a, 0x83, 0x7a, 0xf0, 0xb5, 0x32, 0x35, 0x27, 0xc4, 0xf0, 0x2f, 0xa3, 0x1b, 0x33, 0x20,
+	0xf2, 0x9f, 0x67, 0xc4, 0x8a, 0x88, 0x6d, 0x10, 0x2b, 0x72, 0x7c, 0x2f, 0x14, 0x1b, 0xcc, 0xbf,
+	0xfb, 0x85, 0x56, 0xac, 0x60, 0x62, 0x11, 0xe7, 0x3a, 0x63, 0x65, 0x6b, 0x8d, 0x95, 0x65, 0x21,
+	0xf4, 0x13, 0x3c, 0xea, 0x58, 0x91, 0x73, 0x4d, 0x98, 0x98, 0xec, 0x45, 0x4e, 0x74, 0xab, 0xd8,
+	0x62, 0x93, 0xe9, 0xae, 0x63, 0xa1, 0x5f, 0x60, 0xb7, 0xeb, 0x4f, 0xa7, 0x4e, 0x14, 0x11, 0x3b,
+	0xaf, 0xd4, 0x62, 0x4a, 0x77, 0x70, 0xd1, 0x37, 0x50, 0x9e, 0x7b, 0x4e, 0x28, 0xb6, 0x59, 0x84,
+	0x80, 0x47, 0x68, 0xa4, 0x2a, 0x98, 0xe1, 0xd2, 0xbf, 0x0b, 0x50, 0x1a, 0xa9, 0xca, 0x4a, 0x85,
+	0xf0, 0x9a, 0xef, 0xf1, 0x23, 0x32, 0x26, 0x38, 0x6a, 0x78, 0xbc, 0x1e, 0x62, 0x82, 0x76, 0xd4,
+	0x19, 0x51, 0x7a, 0xbc, 0x0f, 0xd8, 0x77, 0xbe, 0x7a, 0x2a, 0xcb, 0xd5, 0xb3, 0xe8, 0x9d, 0x4d,
+	0x66, 0x3e, 0xc9, 0xe9, 0x8b, 0x4c, 0x4e, 0xab, 0xeb, 0x72, 0x9a, 0xc9, 0xa7, 0xc4, 0xfb, 0xb8,
+	0xc6, 0xce, 0x92, 0x44, 0x6e, 0xe4, 0x39, 0xf1, 0xa9, 0x41, 0xff, 0x4a, 0xff, 0xac, 0x40, 0x95,
+	0x6b, 0x52, 0x2f, 0x55, 0x73, 0x9a, 0xf6, 0x3d, 0xfd, 0xa6, 0x5e, 0x2e, 0x2a, 0x90, 0x1f, 0xed,
+	0x8b, 0xea, 0xbb, 0x73, 0xb7, 0xc6, 0xd0, 0x9c, 0xb0, 0xdd, 0x56, 0x30, 0xfb, 0xa6, 0x58, 0x97,
+	0x62, 0x71, 0x89, 0xb3, 0x6f, 0x7a, 0x0e, 0xa8, 0x84, 0xd8, 0xa1, 0x6c, 0xce, 0x7c, 0x97, 0xed,
+	0xb3, 0x86, 0x33, 0x08, 0x5d, 0x9b, 0x51, 0xf4, 0xf0, 0x64, 0xe7, 0x77, 0x0d, 0x2f, 0x80, 0x94,
+	0xab, 0x4c, 0xa6, 0x33, 0xb6, 0xc5, 0x84, 0x4b, 0x01, 0x24, 0x42, 0x95, 0x5f, 0xb9, 0x71, 0x63,
+	0xe0, 0x84, 0xa4, 0xab, 0x32, 0xf3, 0x71, 0xe0, 0x21, 0xbe, 0x34, 0x17, 0x08, 0xb5, 0x4b, 0xed,
+	0xc7, 0xec, 0x46, 0xbc, 0xe3, 0x14, 0x58, 0xed, 0xea, 0xad, 0x3b, 0xba, 0x5a, 0xe9, 0x9f, 0xe9,
+	0xb1, 0x44, 0x33, 0xb6, 0x91, 0x02, 0x34, 0x6a, 0x23, 0xcf, 0xe1, 0x85, 0xd9, 0xc4, 0x31, 0x41,
+	0xc7, 0x19, 0x9a, 0x1a, 0x73, 0x72, 0x66, 0x46, 0xd6, 0x95, 0xd8, 0x66, 0x5e, 0x67, 0x21, 0x7a,
+	0xc1, 0x8c, 0x42, 0x1a, 0x39, 0x3d, 0x70, 0xfc, 0xc0, 0x89, 0x6e, 0x45, 0x81, 0x19, 0x58, 0x42,
+	0x63, 0x39, 0x23, 0x2b, 0xb7, 0x9d, 0xc8, 0x19, 0x4b, 0x72, 0xbd, 0xbc, 0x3d, 0x14, 0xcb, 0xf5,
+	0x56, 0xec, 0xf5, 0xf2, 0xf6, 0x1e, 0x25, 0x72, 0x39, 0x7b, 0x49, 0x3e, 0x75, 0x5d, 0xf7, 0x65,
+	0xf1, 0x71, 0x26, 0x9f, 0x0c, 0xa1, 0x3d, 0xdd, 0xf5, 0xbd, 0x4b, 0x67, 0x32, 0x0f, 0xc8, 0x99,
+	0x69, 0x25, 0x55, 0xb5, 0xc3, 0x04, 0xd7, 0xb1, 0xd0, 0x0f, 0xb0, 0x2d, 0x7b, 0xe6, 0x85, 0x4b,
+	0xb1, 0x01, 0x31, 0x03, 0xcf, 0xf1, 0x26, 0xe2, 0x2e, 0x93, 0x5f, 0x65, 0x48, 0x26, 0x3c, 0xd6,
+	0xd4, 0xd1, 0x30, 0x30, 0x2f, 0x2f, 0x1d, 0xcb, 0xb0, 0xae, 0x88, 0x3d, 0x77, 0x49, 0x10, 0x22,
+	0x05, 0xda, 0x11, 0x05, 0x17, 0x10, 0x2b, 0xf1, 0xc6, 0xeb, 0xa7, 0x47, 0xb9, 0xb1, 0x75, 0x45,
+	0x13, 0x2f, 0xeb, 0x49, 0x87, 0x50, 0xd6, 0xd4, 0x51, 0x88, 0x0e, 0xa0, 0xe2, 0x44, 0x64, 0x9a,
+	0xdc, 0x36, 0xc9, 0xa9, 0xa1, 0xa9, 0x23, 0x1c, 0x33, 0xa4, 0x9f, 0xa0, 0x66, 0x24, 0x8d, 0xf8,
+	0x2c, 0x2f, 0xbd, 0xdc, 0xb1, 0x5c, 0xe3, 0x10, 0xca, 0x23, 0x55, 0xb9, 0xd3, 0x36, 0x3d, 0x91,
+	0x52, 0xdb, 0x40, 0x57, 0x22, 0x9f, 0xe6, 0x24, 0x8c, 0x1e, 0x32, 0xcc, 0x49, 0x2f, 0x00, 0x74,
+	0x4d, 0x4d, 0x34, 0x72, 0x97, 0x79, 0x61, 0xe9, 0x32, 0x97, 0x06, 0x00, 0x74, 0x2d, 0x2e, 0x7b,
+	0x08, 0x6d, 0xda, 0xd5, 0xab, 0x0b, 0x2c, 0xc3, 0x49, 0x59, 0xf7, 0xf8, 0x31, 0x11, 0x13, 0xd2,
+	0x7f, 0x4a, 0x50, 0xef, 0xb8, 0x66, 0x30, 0x65, 0xc7, 0xcd, 0xbf, 0x4a, 0x50, 0xa1, 0x1f, 0x21,
+	0xaa, 0x42, 0x69, 0xa0, 0x19, 0xc2, 0x06, 0x6a, 0x01, 0xf4, 0x3e, 0x2a, 0x6a, 0x7f, 0xdc, 0xef,
+	0x18, 0xba, 0x50, 0x40, 0x4d, 0xa8, 0x6b, 0xea, 0x68, 0xdc, 0x19, 0x74, 0xf0, 0x99, 0x50, 0x44,
+	0x5f, 0xc1, 0x23, 0x4a, 0x1a, 0xc3, 0x0e, 0x1e, 0x8e, 0xf4, 0xf1, 0x49, 0x47, 0x19, 0x8c, 0xb0,
+	0x2c, 0x94, 0xd0, 0x2e, 0x20, 0xc6, 0x50, 0xfa, 0x6a, 0x67, 0x30, 0xee, 0xc9, 0x7d, 0xdc, 0xe9,
+	0xc9, 0x42, 0x39, 0x51, 0xe8, 0x61, 0xe5, 0x64, 0x38, 0xd6, 0x4e, 0xc6, 0x1f, 0x14, 0xb5, 0xa7,
+	0x7d, 0x10, 0x2a, 0x68, 0x1f, 0x44, 0xca, 0x18, 0x68, 0x86, 0x41, 0x71, 0xed, 0xac, 0xab, 0x8c,
+	0xbb, 0xef, 0x3b, 0xaa, 0x2a, 0x0f, 0x84, 0xcd, 0x74, 0x1d, 0x66, 0xce, 0x48, 0xd7, 0xa9, 0xa2,
+	0xe7, 0xf0, 0x1d, 0x65, 0x0c, 0x71, 0x47, 0x35, 0xce, 0x14, 0xc3, 0x50, 0x34, 0x75, 0xac, 0xa8,
+	0x43, 0x19, 0x9f, 0xc8, 0x58, 0x56, 0xbb, 0xf2, 0xf8, 0x43, 0x07, 0xab, 0x8a, 0xda, 0x17, 0x6a,
+	0x68, 0x0f, 0x76, 0x99, 0xeb, 0xdd, 0xa1, 0x72, 0xde, 0x19, 0x52, 0xc1, 0xc4, 0x4c, 0x1d, 0x89,
+	0xac, 0x38, 0xc7, 0x3a, 0xd6, 0xba, 0xb2, 0x61, 0xd0, 0xfd, 0xca, 0x18, 0x6b, 0x58, 0x00, 0x74,
+	0x00, 0xfb, 0x59, 0xbf, 0x4e, 0xe5, 0x8f, 0x63, 0xe3, 0xa3, 0xda, 0x4d, 0x75, 0x1b, 0x68, 0x07,
+	0xb6, 0xa9, 0x84, 0x32, 0x1c, 0x8d, 0x75, 0x4d, 0xa5, 0xb1, 0x18, 0x1a, 0xc2, 0x16, 0xda, 0x86,
+	0x66, 0x1a, 0x29, 0xaa, 0x2e, 0x34, 0x97, 0xa1, 0x63, 0xa1, 0x95, 0x6c, 0x2c, 0x81, 0xf4, 0xee,
+	0x98, 0xee, 0x42, 0x68, 0x27, 0xf1, 0xc8, 0x31, 0xba, 0xdc, 0x2b, 0x01, 0x21, 0x68, 0x65, 0xb9,
+	0x27, 0x8a, 0xb0, 0x8d, 0x1e, 0x41, 0x3b, 0x8b, 0x75, 0xce, 0x14, 0x01, 0x49, 0x6f, 0xa1, 0xc5,
+	0xf2, 0xab, 0x9b, 0x81, 0x39, 0x25, 0x11, 0x09, 0x90, 0x00, 0xa5, 0x53, 0x72, 0xcb, 0xcb, 0x84,
+	0x7e, 0xd2, 0xd2, 0x38, 0x37, 0xdd, 0x79, 0xf2, 0x38, 0x88, 0x09, 0xe9, 0xef, 0x05, 0x66, 0x8f,
+	0x69, 0x67, 0x4a, 0x33, 0xad, 0x16, 0x6e, 0x61, 0x01, 0x3c, 0x68, 0x2a, 0xdb, 0x85, 0x4d, 0x7a,
+	0xcc, 0xce, 0x43, 0x7e, 0x29, 0x71, 0x0a, 0xfd, 0x0c, 0x90, 0xba, 0x18, 0x8a, 0x65, 0xd6, 0x5b,
+	0x3b, 0xbc, 0xb7, 0xf2, 0x1b, 0xc0, 0x19, 0x41, 0xe9, 0x13, 0xb4, 0xb5, 0xc1, 0x30, 0xe7, 0xe3,
+	0x01, 0x34, 0xd8, 0x71, 0x7f, 0x69, 0x5a, 0x84, 0x8f, 0x04, 0x4d, 0x9c, 0x85, 0xd2, 0x5b, 0x82,
+	0x92, 0x6c, 0x27, 0xc5, 0xcc, 0x2d, 0x91, 0x80, 0x77, 0x79, 0x4a, 0x1f, 0x08, 0xcd, 0x73, 0x12,
+	0x84, 0x8e, 0xef, 0xf1, 0x3d, 0x89, 0x50, 0xbd, 0x8e, 0x01, 0x1e, 0x93, 0x84, 0xa4, 0xf1, 0xba,
+	0x98, 0x3b, 0xae, 0x3d, 0x74, 0xa6, 0xe9, 0xd3, 0x2b, 0x05, 0xe8, 0x89, 0x6c, 0xb1, 0xa9, 0xe7,
+	0xbd, 0x19, 0x5e, 0xf1, 0x55, 0x32, 0x08, 0xd5, 0x9e, 0x38, 0x11, 0x77, 0x22, 0x9e, 0x4f, 0x17,
+	0x80, 0xf4, 0x16, 0x6a, 0x03, 0x7f, 0x32, 0x20, 0xd7, 0xc4, 0xa5, 0x19, 0x74, 0xe9, 0x07, 0x5f,
+	0x3f, 0x26, 0xe8, 0x0e, 0x2c, 0xd3, 0x75, 0x79, 0x26, 0x6a, 0x98, 0x53, 0x92, 0x0c, 0x35, 0x4c,
+	0xc2, 0x99, 0xef, 0x85, 0x04, 0x3d, 0x85, 0x46, 0xc8, 0xec, 0x8d, 0x2d, 0xdf, 0x26, 0x7c, 0x80,
+	0x82, 0x18, 0xea, 0xfa, 0x36, 0xa1, 0x9b, 0x9b, 0x92, 0x30, 0x34, 0x27, 0xc9, 0x06, 0x12, 0x52,
+	0xfa, 0x5b, 0x01, 0x1a, 0xf4, 0x36, 0x4f, 0x02, 0xff, 0x1c, 0x36, 0x35, 0x6f, 0x8e, 0xc9, 0x27,
+	0x7e, 0x7e, 0x6f, 0x67, 0x8e, 0xdd, 0x58, 0x04, 0x73, 0x01, 0xf4, 0x0e, 0xb6, 0x8c, 0xf9, 0x45,
+	0x87, 0x4d, 0x93, 0xe7, 0xa6, 0xcb, 0x2c, 0xb7, 0xd2, 0x7c, 0xa7, 0x2c, 0x76, 0x16, 0xe1, 0x9c,
+	0x28, 0x2d, 0xb2, 0x7e, 0xe0, 0xcf, 0x67, 0xc9, 0xfd, 0x14, 0x87, 0x2d, 0x87, 0x49, 0xa7, 0x50,
+	0xa1, 0x8f, 0x92, 0x10, 0x7d, 0x0d, 0x70, 0xe9, 0xfa, 0x37, 0x63, 0x8b, 0xfd, 0x06, 0xc1, 0xcf,
+	0x52, 0x8a, 0xc4, 0xbf, 0x40, 0x7c, 0x0b, 0x15, 0x4a, 0xd0, 0xd1, 0x89, 0xd6, 0x5b, 0xf3, 0x28,
+	0xf9, 0x11, 0x85, 0x6a, 0xe3, 0x98, 0x27, 0x3d, 0x85, 0x2a, 0xcd, 0x96, 0x3f, 0x8f, 0x68, 0x98,
+	0x6d, 0xe2, 0x9a, 0xb7, 0xdc, 0x52, 0x4c, 0x48, 0x55, 0xa8, 0xc8, 0xd3, 0x59, 0x74, 0xfb, 0x62,
+	0x1f, 0xaa, 0x7c, 0x7c, 0xa3, 0xe7, 0xa7, 0x3c, 0x7c, 0x2f, 0x6c, 0xa0, 0x1a, 0x94, 0x75, 0x6d,
+	0x68, 0x08, 0x85, 0x17, 0xaf, 0xa0, 0x95, 0xdf, 0x18, 0xe5, 0xfd, 0xaa, 0x29, 0xf4, 0x21, 0x58,
+	0x87, 0xca, 0x40, 0xee, 0x9c, 0xcb, 0x42, 0x01, 0x01, 0x6c, 0x52, 0xf0, 0xfc, 0x8d, 0x50, 0x7c,
+	0xfd, 0xdb, 0x16, 0x54, 0x8e, 0x8f, 0x0d, 0x67, 0x8a, 0x5e, 0x42, 0x95, 0xd7, 0x1c, 0xda, 0xe2,
+	0x51, 0x62, 0x6b, 0xee, 0x3d, 0xe6, 0x54, 0xae, 0x22, 0xa5, 0x0d, 0xf4, 0x0a, 0x1a, 0x06, 0x89,
+	0xd2, 0x02, 0x69, 0x73, 0xb1, 0x04, 0xd8, 0x5b, 0x06, 0xa4, 0x0d, 0xf4, 0x0c, 0x36, 0xfb, 0x24,
+	0xd2, 0xdc, 0x68, 0x69, 0x09, 0x58, 0x3c, 0xd6, 0xa4, 0x0d, 0xf4, 0x47, 0x10, 0x63, 0xa9, 0x35,
+	0x2f, 0xbd, 0xa7, 0x9f, 0x79, 0x10, 0xef, 0xed, 0xdf, 0x23, 0x10, 0x4a, 0x1b, 0xe8, 0x47, 0x00,
+	0xdd, 0xbf, 0x21, 0x81, 0xef, 0xad, 0xba, 0x91, 0x78, 0x9c, 0x94, 0xae, 0xb4, 0x81, 0x8e, 0xa0,
+	0x61, 0x5c, 0xcd, 0x23, 0xdb, 0xbf, 0x79, 0x98, 0xfc, 0x0f, 0x50, 0xc7, 0xe4, 0xc2, 0xf7, 0xa3,
+	0x07, 0x49, 0xd3, 0x84, 0x45, 0xfe, 0x6c, 0x82, 0xf5, 0x2e, 0x9d, 0x05, 0x48, 0xf0, 0x79, 0x95,
+	0xd7, 0xd0, 0x36, 0x22, 0x33, 0x88, 0xbe, 0x44, 0xe7, 0x17, 0xd8, 0xc6, 0x24, 0x5c, 0xd2, 0x4a,
+	0x86, 0x10, 0x5e, 0x79, 0xeb, 0xf4, 0x9e, 0xc7, 0xe9, 0x52, 0x47, 0x68, 0xb5, 0xd1, 0xf6, 0x32,
+	0x23, 0x8f, 0xb4, 0x81, 0xbe, 0xa7, 0xe3, 0x76, 0xc4, 0x46, 0xa3, 0xbc, 0x3b, 0x8d, 0x85, 0x18,
+	0x0d, 0xff, 0x1b, 0x68, 0xf4, 0x49, 0x94, 0x0e, 0x46, 0xdb, 0x99, 0xd9, 0x86, 0xdb, 0x6d, 0xe7,
+	0x87, 0xa3, 0x90, 0x25, 0x01, 0xa8, 0x71, 0x6f, 0x3e, 0xf2, 0x9c, 0x70, 0x9d, 0x2f, 0x8d, 0x85,
+	0x19, 0xbe, 0x48, 0x9a, 0xb4, 0xf5, 0xce, 0xdf, 0x11, 0x58, 0xae, 0xd4, 0x71, 0xdd, 0x35, 0x3b,
+	0x59, 0xa3, 0xf3, 0x0e, 0xb6, 0x33, 0x0b, 0x85, 0x9a, 0xa7, 0x6b, 0x6a, 0xba, 0xdc, 0x62, 0xde,
+	0x5a, 0xbf, 0x5c, 0x5a, 0x87, 0x0f, 0x76, 0xf1, 0x15, 0xb4, 0xb8, 0xce, 0x83, 0x3d, 0x7c, 0x0b,
+	0xc2, 0x62, 0x99, 0x2f, 0x72, 0xf0, 0x77, 0xb0, 0xc5, 0x8b, 0x26, 0x7e, 0x8c, 0xdd, 0x93, 0xaa,
+	0x8c, 0xd6, 0x1b, 0x68, 0x70, 0x2d, 0xf6, 0x46, 0x7b, 0x98, 0xd2, 0x31, 0xec, 0x18, 0x2c, 0xbf,
+	0xec, 0x96, 0x55, 0x3c, 0xdb, 0xb1, 0x4c, 0x7a, 0x86, 0xa1, 0xdd, 0x45, 0x58, 0xb2, 0x17, 0xf0,
+	0x3d, 0x36, 0x68, 0xd7, 0xdf, 0x61, 0x23, 0x7f, 0x89, 0xaf, 0xb3, 0xf1, 0x23, 0xd4, 0xfa, 0x24,
+	0x8a, 0xcf, 0xf5, 0x35, 0x19, 0x49, 0x82, 0xcd, 0x04, 0x58, 0x6c, 0xdb, 0xdd, 0x2b, 0xd3, 0x9b,
+	0x10, 0x7a, 0x45, 0xc5, 0x2f, 0x3b, 0xc4, 0x45, 0x32, 0x97, 0xd6, 0xba, 0x85, 0x4e, 0xe1, 0xab,
+	0xb8, 0xa0, 0x57, 0xdf, 0x2a, 0x6b, 0xd6, 0x7d, 0xb2, 0x80, 0x56, 0xe4, 0xd3, 0xd6, 0x63, 0xad,
+	0xb1, 0xbe, 0xf5, 0x78, 0x57, 0xfc, 0x4c, 0x67, 0x92, 0x6b, 0xd3, 0x75, 0x6c, 0x33, 0x22, 0x67,
+	0x76, 0xf8, 0xb0, 0xa2, 0x3b, 0xfe, 0xee, 0x0f, 0xdf, 0x4e, 0x9c, 0xe8, 0x6a, 0x7e, 0x71, 0x64,
+	0xf9, 0x53, 0xf6, 0x3f, 0x00, 0xcb, 0x0f, 0x6c, 0xfe, 0x4f, 0x83, 0xf4, 0xdf, 0x07, 0x17, 0x9b,
+	0xec, 0x37, 0xff, 0x37, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x75, 0xfb, 0x84, 0x52, 0x18,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index 8f0ce27..705b1b1 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -53,6 +53,7 @@
     string IP = 7;
     repeated NNIPort NNIPorts = 5;
     repeated PONPort PONPorts = 6;
+    int32 NniDhcpTrapVid = 8;
 }
 
 message OltAllocatedResourceType {
diff --git a/cmd/bbsim/bbsim.go b/cmd/bbsim/bbsim.go
index b5b613f..2c34e64 100644
--- a/cmd/bbsim/bbsim.go
+++ b/cmd/bbsim/bbsim.go
@@ -152,6 +152,7 @@
 		"NumOnuPerPon":                common.Config.Olt.OnusPonPort,
 		"PonConfiguration":            *common.PonsConfig,
 		"TotalOnus":                   common.Config.Olt.PonPorts * common.Config.Olt.OnusPonPort,
+		"NniDhcpTrapVid":              common.Config.Olt.NniDhcpTrapVid,
 		"Delay":                       common.Config.BBSim.Delay,
 		"Events":                      common.Config.BBSim.Events,
 		"KafkaEventTopic":             common.Config.BBSim.KafkaEventTopic,
diff --git a/internal/bbsim/api/grpc_api_server.go b/internal/bbsim/api/grpc_api_server.go
index 2500cdd..20fc525 100644
--- a/internal/bbsim/api/grpc_api_server.go
+++ b/internal/bbsim/api/grpc_api_server.go
@@ -117,13 +117,14 @@
 	}
 
 	res := bbsim.Olt{
-		ID:            int32(olt.ID),
-		SerialNumber:  olt.SerialNumber,
-		OperState:     olt.OperState.Current(),
-		InternalState: olt.InternalState.Current(),
-		IP:            oltAddress,
-		NNIPorts:      nnis,
-		PONPorts:      pons,
+		ID:             int32(olt.ID),
+		SerialNumber:   olt.SerialNumber,
+		OperState:      olt.OperState.Current(),
+		InternalState:  olt.InternalState.Current(),
+		IP:             oltAddress,
+		NNIPorts:       nnis,
+		PONPorts:       pons,
+		NniDhcpTrapVid: int32(olt.NniDhcpTrapVid),
 	}
 	return &res, nil
 }
diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index 9b99c79..1d61773 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -77,6 +77,7 @@
 	NumOnuPerPon         int
 	NumUni               int
 	NumPots              int
+	NniDhcpTrapVid       int
 	InternalState        *fsm.FSM
 	channel              chan types.Message
 	dhcpServer           dhcp.DHCPServerIf
@@ -117,13 +118,14 @@
 
 func CreateOLT(options common.GlobalConfig, services []common.ServiceYaml, isMock bool) *OltDevice {
 	oltLogger.WithFields(log.Fields{
-		"ID":           options.Olt.ID,
-		"NumNni":       options.Olt.NniPorts,
-		"NniSpeed":     options.Olt.NniSpeed,
-		"NumPon":       options.Olt.PonPorts,
-		"NumOnuPerPon": options.Olt.OnusPonPort,
-		"NumUni":       options.Olt.UniPorts,
-		"NumPots":      options.Olt.PotsPorts,
+		"ID":             options.Olt.ID,
+		"NumNni":         options.Olt.NniPorts,
+		"NniSpeed":       options.Olt.NniSpeed,
+		"NumPon":         options.Olt.PonPorts,
+		"NumOnuPerPon":   options.Olt.OnusPonPort,
+		"NumUni":         options.Olt.UniPorts,
+		"NumPots":        options.Olt.PotsPorts,
+		"NniDhcpTrapVid": options.Olt.NniDhcpTrapVid,
 	}).Debug("CreateOLT")
 
 	olt = OltDevice{
@@ -138,6 +140,7 @@
 		NumOnuPerPon:        int(options.Olt.OnusPonPort),
 		NumUni:              int(options.Olt.UniPorts),
 		NumPots:             int(options.Olt.PotsPorts),
+		NniDhcpTrapVid:      int(options.Olt.NniDhcpTrapVid),
 		Pons:                []*PonPort{},
 		Nnis:                []*NniPort{},
 		Delay:               options.BBSim.Delay,
diff --git a/internal/bbsim/devices/onu_test.go b/internal/bbsim/devices/onu_test.go
index 35f0c28..8a5ba0a 100644
--- a/internal/bbsim/devices/onu_test.go
+++ b/internal/bbsim/devices/onu_test.go
@@ -27,9 +27,10 @@
 	nextStag := map[string]int{}
 
 	olt := OltDevice{
-		ID:      0,
-		NumUni:  4,
-		NumPots: 1,
+		ID:             0,
+		NumUni:         4,
+		NumPots:        1,
+		NniDhcpTrapVid: 60,
 	}
 	pon := PonPort{
 		ID:  1,
@@ -41,4 +42,6 @@
 	assert.Equal(t, "BBSM00000101", onu.Sn())
 	assert.Equal(t, 4, len(onu.UniPorts))
 	assert.Equal(t, 1, len(onu.PotsPorts))
+	assert.Equal(t, 60, olt.NniDhcpTrapVid)
+
 }
diff --git a/internal/bbsim/responders/sadis/sadis.go b/internal/bbsim/responders/sadis/sadis.go
index ce73b1b..98000ff 100644
--- a/internal/bbsim/responders/sadis/sadis.go
+++ b/internal/bbsim/responders/sadis/sadis.go
@@ -90,6 +90,7 @@
 	IPAddress          string `json:"ipAddress"`
 	NasID              string `json:"nasId"`
 	UplinkPort         int    `json:"uplinkPort"`
+	NniDhcpTrapVid     int    `json:"nniDhcpTrapVid,omitempty"`
 }
 
 type SadisOnuEntryV2 struct {
@@ -178,6 +179,7 @@
 		IPAddress:          ip,
 		NasID:              olt.SerialNumber,
 		UplinkPort:         16777216, // TODO currently assumes we only have one NNI port
+		NniDhcpTrapVid:     olt.NniDhcpTrapVid,
 	}
 	return solt, nil
 }
diff --git a/internal/bbsimctl/commands/olt.go b/internal/bbsimctl/commands/olt.go
index d2e72a5..f64f16b 100644
--- a/internal/bbsimctl/commands/olt.go
+++ b/internal/bbsimctl/commands/olt.go
@@ -33,7 +33,7 @@
 )
 
 const (
-	DEFAULT_OLT_DEVICE_HEADER_FORMAT    = "table{{ .ID }}\t{{ .SerialNumber }}\t{{ .OperState }}\t{{ .InternalState }}\t{{ .IP }}"
+	DEFAULT_OLT_DEVICE_HEADER_FORMAT    = "table{{ .ID }}\t{{ .SerialNumber }}\t{{ .OperState }}\t{{ .InternalState }}\t{{ .IP }}\t{{ .NniDhcpTrapVid }}"
 	DEFAULT_OLT_RESOURCES_HEADER_FORMAT = "table{{ .Type }}\t{{ .PonPortId }}\t{{ .OnuId }}\t{{ .PortNo }}\t{{ .ResourceId }}\t{{ .FlowId }}"
 	DEFAULT_NNI_PORT_HEADER_FORMAT      = "table{{ .ID }}\t{{ .OperState }}\t{{ .InternalState }}\t{{ .PacketCount }}"
 	DEFAULT_PON_PORT_HEADER_FORMAT      = "table{{ .ID }}\t{{ .Technology }}\t{{ .OperState }}\t{{ .InternalState }}\t{{ .PacketCount }}\t{{ .AllocatedOnuIds }}\t{{ .AllocatedGemPorts }}\t{{ .AllocatedAllocIds }}"
diff --git a/internal/common/options.go b/internal/common/options.go
index 494473c..44b571a 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -94,6 +94,7 @@
 	OmciResponseRate   uint8  `yaml:"omci_response_rate"`
 	UniPorts           uint32 `yaml:"uni_ports"`
 	PotsPorts          uint32 `yaml:"pots_ports"`
+	NniDhcpTrapVid     uint32 `yaml:"nni_dhcp_trap_vid"`
 }
 
 type PonPortsConfig struct {
@@ -333,6 +334,7 @@
 	onu := flag.Int("onu", int(conf.Olt.OnusPonPort), "Number of ONU devices per PON port to be emulated")
 	uni := flag.Int("uni", int(conf.Olt.UniPorts), "Number of Ethernet UNI Ports per ONU device to be emulated")
 	pots := flag.Int("pots", int(conf.Olt.PotsPorts), "Number of POTS UNI Ports per ONU device to be emulated")
+	NniDchpTrapVid := flag.Int("nni_dhcp_trap_vid", int(conf.Olt.NniDhcpTrapVid), "Vlan to trap the DHCP packets on")
 
 	oltRebootDelay := flag.Int("oltRebootDelay", conf.Olt.OltRebootDelay, "Time that BBSim should before restarting after a reboot")
 	omci_response_rate := flag.Int("omci_response_rate", int(conf.Olt.OmciResponseRate), "Amount of OMCI messages to respond to")
@@ -367,6 +369,7 @@
 	conf.Olt.UniPorts = uint32(*uni)
 	conf.Olt.PotsPorts = uint32(*pots)
 	conf.Olt.OnusPonPort = uint32(*onu)
+	conf.Olt.NniDhcpTrapVid = uint32(*NniDchpTrapVid)
 	conf.Olt.OltRebootDelay = *oltRebootDelay
 	conf.Olt.OmciResponseRate = uint8(*omci_response_rate)
 	conf.BBSim.ConfigFile = *configFile
@@ -450,6 +453,7 @@
 			OmciResponseRate:   10,
 			UniPorts:           4,
 			PotsPorts:          0,
+			NniDhcpTrapVid:     0,
 		},
 		BBRConfig{
 			LogLevel:  "debug",