diff --git a/VERSION b/VERSION
index 32786aa..a29de84 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.18
+0.0.19-dev
diff --git a/api/bbsim/bbsim.pb.go b/api/bbsim/bbsim.pb.go
index 1a36b63..c9ffa1c 100644
--- a/api/bbsim/bbsim.pb.go
+++ b/api/bbsim/bbsim.pb.go
@@ -10,8 +10,6 @@
 	openolt "github.com/opencord/voltha-protos/v2/go/openolt"
 	tech_profile "github.com/opencord/voltha-protos/v2/go/tech_profile"
 	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	math "math"
 )
 
@@ -233,6 +231,7 @@
 	SerialNumber         string     `protobuf:"bytes,2,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
 	OperState            string     `protobuf:"bytes,3,opt,name=OperState,proto3" json:"OperState,omitempty"`
 	InternalState        string     `protobuf:"bytes,4,opt,name=InternalState,proto3" json:"InternalState,omitempty"`
+	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"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
@@ -293,6 +292,13 @@
 	return ""
 }
 
+func (m *Olt) GetIP() string {
+	if m != nil {
+		return m.IP
+	}
+	return ""
+}
+
 func (m *Olt) GetNNIPorts() []*NNIPort {
 	if m != nil {
 		return m.NNIPorts
@@ -1034,97 +1040,98 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim.proto", fileDescriptor_ef7750073d18011b) }
 
 var fileDescriptor_ef7750073d18011b = []byte{
-	// 1290 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4d, 0x6f, 0xdb, 0x46,
-	0x13, 0xd6, 0x87, 0xf5, 0x35, 0xb2, 0x64, 0x7a, 0x13, 0x3b, 0x82, 0xe3, 0xf7, 0x8d, 0xc0, 0xa6,
-	0x85, 0x13, 0x34, 0x4e, 0x63, 0xb7, 0x68, 0x7a, 0xa4, 0x25, 0x5a, 0x61, 0x2d, 0x93, 0xc2, 0x92,
-	0x72, 0x90, 0x13, 0x41, 0x49, 0x6b, 0x8b, 0x00, 0x45, 0x2a, 0xe4, 0x2a, 0x46, 0xce, 0x45, 0xff,
-	0x48, 0x7f, 0x51, 0x2f, 0xbd, 0xf6, 0x7f, 0xf4, 0x56, 0xec, 0x72, 0x49, 0x91, 0x96, 0x53, 0x18,
-	0xbd, 0xf4, 0x22, 0xec, 0x3c, 0xf3, 0xcc, 0xec, 0x7c, 0x71, 0xb4, 0xb0, 0xe7, 0x2c, 0xdd, 0xd7,
-	0x93, 0x49, 0xe4, 0x2e, 0xe2, 0xdf, 0xe3, 0x65, 0x18, 0xd0, 0x00, 0x55, 0xb8, 0x70, 0xf0, 0xf4,
-	0x53, 0xe0, 0xd1, 0xb9, 0x63, 0x73, 0x30, 0x7a, 0x1d, 0x2c, 0x89, 0x1f, 0x78, 0x34, 0xe6, 0x1c,
-	0x74, 0xf3, 0x4a, 0x4a, 0xa6, 0x73, 0x76, 0xbe, 0x76, 0x3d, 0x12, 0x33, 0xe4, 0x1f, 0xa1, 0x36,
-	0x32, 0xf4, 0x51, 0x10, 0x52, 0xd4, 0x86, 0x92, 0xd6, 0xef, 0x14, 0xbb, 0xc5, 0xa3, 0x0a, 0x2e,
-	0x69, 0x7d, 0x74, 0x08, 0x0d, 0x63, 0x49, 0x42, 0x93, 0x3a, 0x94, 0x74, 0x4a, 0xdd, 0xe2, 0x51,
-	0x03, 0xaf, 0x01, 0x66, 0xa8, 0xeb, 0xda, 0xbf, 0x30, 0xfc, 0xa3, 0x08, 0x65, 0xc3, 0xdb, 0xb4,
-	0x92, 0x61, 0xdb, 0x24, 0xa1, 0xeb, 0x78, 0xfa, 0x6a, 0x31, 0x21, 0xa1, 0x30, 0xcc, 0x61, 0x79,
-	0xcf, 0xe5, 0x3b, 0x9e, 0xd1, 0x73, 0x68, 0x69, 0x3e, 0x25, 0xa1, 0xef, 0x78, 0x31, 0x63, 0x8b,
-	0x33, 0xf2, 0x20, 0x7a, 0x09, 0x75, 0x11, 0x78, 0xd4, 0xa9, 0x74, 0xcb, 0x47, 0xcd, 0x93, 0xf6,
-	0x71, 0x5c, 0x57, 0x01, 0xe3, 0x54, 0xcf, 0xb8, 0xa2, 0x3a, 0x51, 0xa7, 0x9a, 0xe3, 0x0a, 0x18,
-	0xa7, 0x7a, 0xf9, 0x2f, 0x96, 0x97, 0x3e, 0xfe, 0xcf, 0xf2, 0x3a, 0x84, 0xc6, 0x28, 0xf0, 0x59,
-	0x2c, 0x5a, 0xbf, 0x53, 0xe1, 0xd7, 0xaf, 0x01, 0x84, 0x60, 0xcb, 0xb4, 0x9c, 0x9b, 0x4e, 0x95,
-	0x2b, 0xf8, 0x99, 0x61, 0x3d, 0x86, 0xd5, 0x62, 0x8c, 0x9d, 0x99, 0x97, 0x77, 0xb7, 0xca, 0x6c,
-	0x16, 0x92, 0x28, 0xea, 0xd4, 0xe3, 0x48, 0x52, 0x00, 0xed, 0x43, 0x95, 0xf9, 0xd3, 0x83, 0x4e,
-	0x83, 0xdb, 0x08, 0x49, 0x76, 0xe0, 0xb1, 0xa1, 0x8f, 0xad, 0xd0, 0xb9, 0xbe, 0x76, 0xa7, 0xe6,
-	0x74, 0x4e, 0x66, 0x2b, 0x8f, 0x84, 0x11, 0xd2, 0x60, 0x87, 0x32, 0x70, 0x0d, 0xf1, 0xc2, 0x34,
-	0x4f, 0x9e, 0x1d, 0xe7, 0x66, 0x71, 0xc3, 0x12, 0xdf, 0xb5, 0x93, 0x8f, 0x60, 0xcb, 0xd0, 0xc7,
-	0x11, 0xea, 0x42, 0xc5, 0xa5, 0x64, 0xc1, 0x1c, 0xb1, 0x7e, 0x80, 0xe8, 0x87, 0xa1, 0x8f, 0x71,
-	0xac, 0x90, 0xbf, 0x03, 0x60, 0x12, 0xf9, 0xb8, 0x22, 0x11, 0xdd, 0x28, 0x7f, 0x71, 0xb3, 0xfc,
-	0xf2, 0x9f, 0x65, 0x68, 0x28, 0x9e, 0x13, 0x2e, 0xac, 0xcf, 0x4b, 0x22, 0xff, 0x5e, 0x86, 0x0a,
-	0x3b, 0x44, 0xa8, 0x06, 0xe5, 0xa1, 0x61, 0x4a, 0x05, 0xd4, 0x06, 0xe8, 0x7f, 0xd0, 0xf4, 0x81,
-	0x3d, 0x50, 0xcc, 0x91, 0x54, 0x44, 0x2d, 0x68, 0x18, 0xfa, 0xd8, 0x56, 0x86, 0x0a, 0xbe, 0x94,
-	0x4a, 0xe8, 0x09, 0x3c, 0x62, 0xa2, 0x69, 0x29, 0xd8, 0x1a, 0x8f, 0xec, 0x73, 0x45, 0x1b, 0x8e,
-	0xb1, 0x2a, 0x95, 0xd1, 0x3e, 0x20, 0xae, 0xd0, 0x06, 0xba, 0x32, 0xb4, 0xfb, 0xea, 0x00, 0x2b,
-	0x7d, 0x55, 0xda, 0x4a, 0x0c, 0xfa, 0x58, 0x3b, 0xb7, 0x6c, 0xe3, 0xdc, 0x7e, 0xaf, 0xe9, 0x7d,
-	0xe3, 0xbd, 0x54, 0x41, 0x87, 0xd0, 0x61, 0x8a, 0xa1, 0x61, 0x9a, 0x0c, 0x37, 0x2e, 0x7b, 0x9a,
-	0xdd, 0x7b, 0xa7, 0xe8, 0xba, 0x3a, 0x94, 0xaa, 0xe9, 0x3d, 0xdc, 0x9d, 0x99, 0xde, 0x53, 0x43,
-	0x2f, 0xe0, 0x6b, 0xa6, 0xb0, 0xb0, 0xa2, 0x9b, 0x97, 0x9a, 0x69, 0x6a, 0x86, 0x6e, 0x6b, 0xba,
-	0xa5, 0xe2, 0x73, 0x15, 0xab, 0x7a, 0x4f, 0xb5, 0xdf, 0x2b, 0x58, 0xd7, 0xf4, 0x81, 0x54, 0x47,
-	0x07, 0xb0, 0xcf, 0x43, 0xef, 0x59, 0xda, 0x95, 0x62, 0x31, 0x62, 0xe2, 0xa6, 0x81, 0x3a, 0xbc,
-	0x8d, 0xf6, 0x08, 0x1b, 0x3d, 0xd5, 0x34, 0x59, 0xbe, 0x2a, 0xc6, 0x06, 0x96, 0x00, 0x75, 0xe1,
-	0x30, 0x1b, 0xd7, 0x85, 0xfa, 0xc1, 0x36, 0x3f, 0xe8, 0xbd, 0xd4, 0xb6, 0x89, 0xf6, 0x60, 0x97,
-	0x31, 0x34, 0x6b, 0x6c, 0x8f, 0x0c, 0x9d, 0xd5, 0xc2, 0x32, 0xa5, 0x6d, 0xb4, 0x0b, 0xad, 0xb4,
-	0x52, 0xcc, 0x5c, 0x6a, 0xdd, 0x85, 0xce, 0xa4, 0x76, 0x92, 0x58, 0x02, 0x8d, 0x7a, 0x36, 0xcb,
-	0x42, 0xda, 0x49, 0xea, 0x91, 0x53, 0xf4, 0x44, 0x54, 0x12, 0x42, 0xd0, 0xce, 0x6a, 0xcf, 0x35,
-	0x69, 0x17, 0x3d, 0x82, 0x9d, 0x2c, 0xa6, 0x5c, 0x6a, 0x12, 0x92, 0xdf, 0x42, 0x9b, 0xf7, 0x77,
-	0xe4, 0x84, 0xce, 0x82, 0x50, 0x12, 0x22, 0x09, 0xca, 0x17, 0xe4, 0xb3, 0x98, 0x06, 0x76, 0x44,
-	0x8f, 0xa1, 0x72, 0xe5, 0x78, 0xab, 0x64, 0x63, 0xc5, 0x82, 0xfc, 0x5b, 0x91, 0xfb, 0xe3, 0xd6,
-	0xc9, 0x48, 0x1d, 0x66, 0xa6, 0x45, 0x78, 0x58, 0x03, 0x0f, 0xfa, 0xde, 0xf7, 0xa1, 0xca, 0x3e,
-	0xda, 0x55, 0x24, 0x3e, 0x76, 0x21, 0xa1, 0x1f, 0x00, 0xd2, 0x10, 0xa3, 0xce, 0x16, 0x9f, 0xf0,
-	0x3d, 0x31, 0xe1, 0xf9, 0x04, 0x70, 0x86, 0x28, 0x7f, 0x84, 0x1d, 0x63, 0x68, 0xe5, 0x62, 0xec,
-	0x42, 0x93, 0xaf, 0x87, 0x6b, 0x67, 0x4a, 0xc4, 0x3a, 0x6a, 0xe1, 0x2c, 0x94, 0x6e, 0x15, 0x26,
-	0xf2, 0x4c, 0x4a, 0x99, 0xad, 0x92, 0x80, 0x5f, 0x8a, 0x54, 0xfe, 0xb5, 0x08, 0xad, 0x2b, 0x12,
-	0x46, 0x6e, 0xe0, 0x8b, 0x9c, 0x3a, 0x50, 0xfb, 0x14, 0x03, 0xa2, 0x26, 0x89, 0xc8, 0xea, 0x35,
-	0x59, 0xb9, 0xde, 0xcc, 0x72, 0x17, 0xe9, 0xff, 0x41, 0x0a, 0xa0, 0xff, 0x03, 0x4c, 0x83, 0xc5,
-	0xc2, 0xa5, 0xef, 0x9c, 0x68, 0x2e, 0x6e, 0xc9, 0x20, 0xcc, 0xfa, 0xc6, 0xa5, 0x22, 0x88, 0x78,
-	0xf3, 0xad, 0x01, 0xf9, 0x2d, 0xd4, 0x87, 0xc1, 0xcd, 0x90, 0x7c, 0x22, 0x1e, 0xeb, 0xa0, 0xc7,
-	0x0e, 0xe2, 0xfe, 0x58, 0x60, 0x19, 0x4c, 0x1d, 0xcf, 0x13, 0x9d, 0xa8, 0x63, 0x21, 0xc9, 0x2a,
-	0xd4, 0x31, 0x89, 0x96, 0x81, 0x1f, 0x11, 0xf4, 0x0c, 0x9a, 0x11, 0xf7, 0x67, 0x4f, 0x83, 0x19,
-	0x11, 0xcb, 0x1b, 0x62, 0xa8, 0x17, 0xcc, 0x08, 0x4b, 0x6e, 0x41, 0xa2, 0xc8, 0xb9, 0x49, 0x12,
-	0x48, 0x44, 0x39, 0x82, 0xa6, 0x76, 0xb3, 0x58, 0x26, 0x75, 0x7f, 0x01, 0x55, 0xc3, 0x5f, 0x61,
-	0xf2, 0x51, 0x2c, 0xba, 0xdd, 0xcc, 0x7e, 0x8a, 0x29, 0x58, 0x10, 0xd0, 0x4f, 0xb0, 0x6d, 0xae,
-	0x26, 0xca, 0x94, 0xba, 0x81, 0x7f, 0xe5, 0x78, 0xdc, 0x71, 0x3b, 0x6d, 0x77, 0xaa, 0xe2, 0xab,
-	0x08, 0xe7, 0xa8, 0xf2, 0x05, 0x54, 0xce, 0xbd, 0xe0, 0x36, 0x42, 0xff, 0x03, 0xb8, 0xf6, 0x82,
-	0x5b, 0x7b, 0x1a, 0xac, 0x7c, 0x2a, 0xba, 0xdc, 0x60, 0x48, 0x8f, 0x01, 0xe8, 0x2b, 0xa8, 0x30,
-	0x21, 0xea, 0x94, 0xf8, 0x28, 0xb5, 0x8e, 0x93, 0xe7, 0x01, 0xb3, 0xc6, 0xb1, 0x4e, 0xae, 0x41,
-	0x45, 0x5d, 0x2c, 0xe9, 0xe7, 0x97, 0x6f, 0xa0, 0x9d, 0xbf, 0x15, 0xd5, 0x61, 0xeb, 0x67, 0x43,
-	0xd3, 0xa5, 0x02, 0x6a, 0x40, 0x65, 0xa8, 0x2a, 0x57, 0xaa, 0x54, 0x44, 0x00, 0x55, 0x06, 0x5e,
-	0x9d, 0x4a, 0xa5, 0x93, 0x5f, 0x6a, 0x50, 0x39, 0x3b, 0x33, 0xdd, 0x05, 0x7a, 0x0d, 0x35, 0x31,
-	0x0f, 0x68, 0x5b, 0xa4, 0xc0, 0xbd, 0x1e, 0x3c, 0x16, 0x52, 0x6e, 0x5a, 0xe4, 0x02, 0x7a, 0x0e,
-	0xd5, 0x01, 0xa1, 0xec, 0x25, 0x90, 0xe7, 0xa7, 0x1b, 0xdd, 0xa3, 0x72, 0x01, 0xbd, 0x02, 0x18,
-	0x05, 0xb7, 0x24, 0x0c, 0xfc, 0x4d, 0xe6, 0x8e, 0x90, 0x92, 0x36, 0xca, 0x05, 0x74, 0x0c, 0x4d,
-	0x73, 0xbe, 0xa2, 0xb3, 0xe0, 0xf6, 0x61, 0xfc, 0x6f, 0xa1, 0x81, 0xc9, 0x24, 0x08, 0xe8, 0x83,
-	0xd8, 0xdf, 0x40, 0x8d, 0x85, 0xcc, 0xfe, 0x86, 0xf2, 0xdc, 0xe6, 0xba, 0xcb, 0x91, 0x5c, 0x60,
-	0x43, 0x10, 0xf3, 0xd0, 0x66, 0xfb, 0x0f, 0x32, 0xff, 0x58, 0x72, 0x01, 0xbd, 0x81, 0xa6, 0x49,
-	0x68, 0x3a, 0xc2, 0xc9, 0xa5, 0x09, 0x70, 0x70, 0x17, 0x90, 0x0b, 0xe8, 0x34, 0x93, 0xe3, 0xfd,
-	0x57, 0xdc, 0x13, 0xfa, 0xc9, 0xba, 0x8e, 0x0f, 0xb6, 0xf9, 0x1e, 0xb6, 0x31, 0x89, 0xa8, 0x13,
-	0x52, 0xd5, 0x59, 0x06, 0xde, 0x03, 0xad, 0x4e, 0xa1, 0x29, 0xac, 0xfa, 0xf3, 0xe9, 0xf2, 0x81,
-	0x46, 0x67, 0xb0, 0x67, 0x12, 0x6a, 0xf8, 0x2b, 0xbe, 0xc4, 0x34, 0x7f, 0xe6, 0x4e, 0x1d, 0x36,
-	0x86, 0x68, 0x7f, 0x6d, 0x9e, 0xdd, 0x6f, 0xff, 0xe0, 0xc3, 0xa3, 0x5f, 0xf4, 0x91, 0xdf, 0x91,
-	0xf7, 0xf9, 0x78, 0x05, 0xf5, 0x01, 0xa1, 0xf1, 0xb7, 0x75, 0x4f, 0xe4, 0x49, 0xd7, 0x39, 0x41,
-	0x2e, 0xa0, 0xb7, 0xb0, 0xd3, 0x9b, 0x3b, 0xfe, 0x0d, 0x61, 0x2b, 0x20, 0x7e, 0x86, 0x21, 0x41,
-	0xc9, 0x2c, 0x85, 0xfb, 0x2e, 0xba, 0x80, 0x27, 0x03, 0x9e, 0xf0, 0xe6, 0xa3, 0xe9, 0x9e, 0x7b,
-	0x9f, 0xae, 0xa1, 0x0d, 0xbe, 0x5c, 0x98, 0x54, 0xf9, 0x5b, 0xfe, 0xf4, 0xef, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x54, 0xe5, 0xac, 0xa2, 0x2a, 0x0c, 0x00, 0x00,
+	// 1297 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcb, 0x6e, 0xdb, 0x46,
+	0x17, 0xd6, 0xc5, 0xba, 0x1d, 0x59, 0x32, 0x3d, 0x89, 0x1d, 0xc2, 0xf1, 0xff, 0x47, 0x60, 0xd3,
+	0xc2, 0x09, 0x1a, 0xa7, 0xb1, 0x5b, 0x34, 0x5d, 0xd2, 0x12, 0xad, 0xb0, 0x96, 0x49, 0x61, 0x48,
+	0x39, 0xc8, 0x8a, 0xa0, 0xa4, 0xb1, 0x45, 0x80, 0x12, 0x15, 0x72, 0x14, 0x23, 0xeb, 0xa2, 0x2f,
+	0xd2, 0x27, 0xea, 0x13, 0x74, 0xd7, 0x87, 0xe8, 0xae, 0x98, 0xe1, 0x90, 0x22, 0x2d, 0xa7, 0x30,
+	0xba, 0xe9, 0x46, 0xe0, 0xf9, 0xce, 0x77, 0xee, 0x87, 0x47, 0x84, 0x3d, 0x77, 0xe9, 0xbd, 0x1e,
+	0x8f, 0x23, 0x6f, 0x1e, 0xff, 0x1e, 0x2f, 0xc3, 0x80, 0x06, 0xa8, 0xc2, 0x85, 0x83, 0xa7, 0x9f,
+	0x02, 0x9f, 0xce, 0x5c, 0x87, 0x83, 0xd1, 0xeb, 0x60, 0x49, 0x16, 0x81, 0x4f, 0x63, 0xce, 0x41,
+	0x27, 0xaf, 0xa4, 0x64, 0x32, 0x63, 0xcf, 0xd7, 0x9e, 0x4f, 0x62, 0x86, 0xf2, 0x23, 0xd4, 0x86,
+	0xa6, 0x31, 0x0c, 0x42, 0x8a, 0xda, 0x50, 0xd2, 0x7b, 0x72, 0xb1, 0x53, 0x3c, 0xaa, 0xe0, 0x92,
+	0xde, 0x43, 0x87, 0xd0, 0x30, 0x97, 0x24, 0xb4, 0xa8, 0x4b, 0x89, 0x5c, 0xea, 0x14, 0x8f, 0x1a,
+	0x78, 0x0d, 0x30, 0x43, 0xc3, 0xd0, 0xff, 0x85, 0xe1, 0x9f, 0x45, 0x28, 0x9b, 0xfe, 0xa6, 0x95,
+	0x02, 0xdb, 0x16, 0x09, 0x3d, 0xd7, 0x37, 0x56, 0xf3, 0x31, 0x09, 0x85, 0x61, 0x0e, 0xcb, 0x7b,
+	0x2e, 0xdf, 0xf1, 0x8c, 0x9e, 0x43, 0x4b, 0x5f, 0x50, 0x12, 0x2e, 0x5c, 0x3f, 0x66, 0x6c, 0x71,
+	0x46, 0x1e, 0xe4, 0x71, 0x87, 0x72, 0x8d, 0xab, 0x4a, 0xfa, 0x10, 0xbd, 0x84, 0xba, 0x28, 0x24,
+	0x92, 0x2b, 0x9d, 0xf2, 0x51, 0xf3, 0xa4, 0x7d, 0x1c, 0xf7, 0x59, 0xc0, 0x38, 0xd5, 0x33, 0xae,
+	0xe8, 0x56, 0x24, 0x57, 0x73, 0x5c, 0x01, 0xe3, 0x54, 0xaf, 0xfc, 0xc5, 0xea, 0x34, 0x46, 0xff,
+	0x59, 0x9d, 0x87, 0xd0, 0x18, 0x06, 0x0b, 0x96, 0x8b, 0xde, 0x93, 0x2b, 0x3c, 0xfc, 0x1a, 0x40,
+	0x08, 0xb6, 0x2c, 0xdb, 0xbd, 0x91, 0xab, 0x5c, 0xc1, 0x9f, 0x19, 0xd6, 0x65, 0x58, 0x2d, 0xc6,
+	0xd8, 0x33, 0xf3, 0xf2, 0xee, 0x56, 0x9d, 0x4e, 0x43, 0x12, 0x45, 0x72, 0x3d, 0xce, 0x24, 0x05,
+	0xd0, 0x3e, 0x54, 0x99, 0x3f, 0x23, 0x90, 0x1b, 0xdc, 0x46, 0x48, 0x8a, 0x0b, 0x8f, 0x4d, 0x63,
+	0x64, 0x87, 0xee, 0xf5, 0xb5, 0x37, 0xb1, 0x26, 0x33, 0x32, 0x5d, 0xf9, 0x24, 0x8c, 0x90, 0x0e,
+	0x3b, 0x94, 0x81, 0x6b, 0x88, 0x37, 0xa6, 0x79, 0xf2, 0xec, 0x38, 0xb7, 0x9b, 0x1b, 0x96, 0xf8,
+	0xae, 0x9d, 0x72, 0x04, 0x5b, 0xa6, 0x31, 0x8a, 0x50, 0x07, 0x2a, 0x1e, 0x25, 0x73, 0xe6, 0x88,
+	0xcd, 0x03, 0xc4, 0x3c, 0x4c, 0x63, 0x84, 0x63, 0x85, 0xf2, 0x1d, 0x00, 0x93, 0xc8, 0xc7, 0x15,
+	0x89, 0xe8, 0x46, 0xfb, 0x8b, 0x9b, 0xed, 0x57, 0xfe, 0x28, 0x43, 0x43, 0xf5, 0xdd, 0x70, 0x6e,
+	0x7f, 0x5e, 0x12, 0xe5, 0xf7, 0x32, 0x54, 0xd8, 0x43, 0x84, 0x6a, 0x50, 0x1e, 0x98, 0x96, 0x54,
+	0x40, 0x6d, 0x80, 0xde, 0x07, 0xdd, 0xe8, 0x3b, 0x7d, 0xd5, 0x1a, 0x4a, 0x45, 0xd4, 0x82, 0x86,
+	0x69, 0x8c, 0x1c, 0x75, 0xa0, 0xe2, 0x4b, 0xa9, 0x84, 0x9e, 0xc0, 0x23, 0x26, 0x5a, 0xb6, 0x8a,
+	0xed, 0xd1, 0xd0, 0x39, 0x57, 0xf5, 0xc1, 0x08, 0x6b, 0x52, 0x19, 0xed, 0x03, 0xe2, 0x0a, 0xbd,
+	0x6f, 0xa8, 0x03, 0xa7, 0xa7, 0xf5, 0xb1, 0xda, 0xd3, 0xa4, 0xad, 0xc4, 0xa0, 0x87, 0xf5, 0x73,
+	0xdb, 0x31, 0xcf, 0x9d, 0xf7, 0xba, 0xd1, 0x33, 0xdf, 0x4b, 0x15, 0x74, 0x08, 0x32, 0x53, 0x0c,
+	0x4c, 0xcb, 0x62, 0xb8, 0x79, 0xd9, 0xd5, 0x9d, 0xee, 0x3b, 0xd5, 0x30, 0xb4, 0x81, 0x54, 0x4d,
+	0xe3, 0x70, 0x77, 0x56, 0x1a, 0xa7, 0x86, 0x5e, 0xc0, 0xd7, 0x4c, 0x61, 0x63, 0xd5, 0xb0, 0x2e,
+	0x75, 0xcb, 0xd2, 0x4d, 0xc3, 0xd1, 0x0d, 0x5b, 0xc3, 0xe7, 0x1a, 0xd6, 0x8c, 0xae, 0xe6, 0xbc,
+	0x57, 0xb1, 0xa1, 0x1b, 0x7d, 0xa9, 0x8e, 0x0e, 0x60, 0x9f, 0xa7, 0xde, 0xb5, 0xf5, 0x2b, 0xd5,
+	0x66, 0xc4, 0xc4, 0x4d, 0x03, 0xc9, 0x7c, 0x8c, 0xce, 0x10, 0x9b, 0x5d, 0xcd, 0xb2, 0x58, 0xbd,
+	0x1a, 0xc6, 0x26, 0x96, 0x00, 0x75, 0xe0, 0x30, 0x9b, 0xd7, 0x85, 0xf6, 0xc1, 0xb1, 0x3e, 0x18,
+	0xdd, 0xd4, 0xb6, 0x89, 0xf6, 0x60, 0x97, 0x31, 0x74, 0x7b, 0xe4, 0x0c, 0x4d, 0x83, 0xf5, 0xc2,
+	0xb6, 0xa4, 0x6d, 0xb4, 0x0b, 0xad, 0xb4, 0x53, 0xcc, 0x5c, 0x6a, 0xdd, 0x85, 0xce, 0xa4, 0x76,
+	0x52, 0x58, 0x02, 0x0d, 0xbb, 0x0e, 0xab, 0x42, 0xda, 0x49, 0xfa, 0x91, 0x53, 0x74, 0x45, 0x56,
+	0x12, 0x42, 0xd0, 0xce, 0x6a, 0xcf, 0x75, 0x69, 0x17, 0x3d, 0x82, 0x9d, 0x2c, 0xa6, 0x5e, 0xea,
+	0x12, 0x52, 0xde, 0x42, 0x9b, 0xcf, 0x77, 0xe8, 0x86, 0xee, 0x9c, 0x50, 0x12, 0x22, 0x09, 0xca,
+	0x17, 0xe4, 0xb3, 0xd8, 0x06, 0xf6, 0x88, 0x1e, 0x43, 0xe5, 0xca, 0xf5, 0x57, 0xc9, 0x05, 0x8b,
+	0x05, 0xe5, 0xb7, 0x22, 0xf7, 0xc7, 0xad, 0x93, 0x95, 0x3a, 0xcc, 0x6c, 0x8b, 0xf0, 0xb0, 0x06,
+	0x1e, 0xf4, 0xbe, 0xef, 0x43, 0x95, 0xbd, 0xb4, 0xab, 0x48, 0xbc, 0xec, 0x42, 0x42, 0x3f, 0x00,
+	0xa4, 0x29, 0x46, 0xf2, 0x16, 0xdf, 0xf0, 0x3d, 0xb1, 0xe1, 0xf9, 0x02, 0x70, 0x86, 0xa8, 0x7c,
+	0x84, 0x1d, 0x73, 0x60, 0xe7, 0x72, 0xec, 0x40, 0x93, 0x9f, 0x87, 0x6b, 0x77, 0x42, 0xc4, 0x39,
+	0x6a, 0xe1, 0x2c, 0x94, 0x5e, 0x15, 0x26, 0xf2, 0x4a, 0x4a, 0x99, 0xab, 0x92, 0x80, 0x5f, 0xca,
+	0x54, 0xf9, 0xb5, 0x08, 0xad, 0x2b, 0x12, 0x46, 0x5e, 0xb0, 0x10, 0x35, 0xc9, 0x50, 0xfb, 0x14,
+	0x03, 0xa2, 0x27, 0x89, 0xc8, 0xfa, 0x35, 0x5e, 0x79, 0xfe, 0xd4, 0xf6, 0xe6, 0xe9, 0xff, 0x43,
+	0x0a, 0xa0, 0xff, 0x03, 0x4c, 0x82, 0xf9, 0xdc, 0xa3, 0xef, 0xdc, 0x68, 0x26, 0xa2, 0x64, 0x10,
+	0x66, 0x7d, 0xe3, 0x51, 0x91, 0x44, 0x7c, 0xf9, 0xd6, 0x80, 0xf2, 0x16, 0xea, 0x83, 0xe0, 0x66,
+	0x40, 0x3e, 0x11, 0x9f, 0x4d, 0xd0, 0x67, 0x0f, 0x22, 0x7e, 0x2c, 0xb0, 0x0a, 0x26, 0xae, 0xef,
+	0x8b, 0x49, 0xd4, 0xb1, 0x90, 0x14, 0x0d, 0xea, 0x98, 0x44, 0xcb, 0x60, 0x11, 0x11, 0xf4, 0x0c,
+	0x9a, 0x11, 0xf7, 0xe7, 0x4c, 0x82, 0x29, 0x11, 0xc7, 0x1b, 0x62, 0xa8, 0x1b, 0x4c, 0x09, 0x2b,
+	0x6e, 0x4e, 0xa2, 0xc8, 0xbd, 0x49, 0x0a, 0x48, 0x44, 0x25, 0x82, 0xa6, 0x7e, 0x33, 0x5f, 0x26,
+	0x7d, 0x7f, 0x01, 0x55, 0x73, 0xb1, 0xc2, 0xe4, 0xa3, 0x38, 0x74, 0xbb, 0x99, 0xfb, 0x14, 0x53,
+	0xb0, 0x20, 0xa0, 0x9f, 0x60, 0xdb, 0x5a, 0x8d, 0xd5, 0x09, 0xf5, 0x82, 0xc5, 0x95, 0xeb, 0x73,
+	0xc7, 0xed, 0x74, 0xdc, 0xa9, 0x8a, 0x9f, 0x22, 0x9c, 0xa3, 0x2a, 0x17, 0x50, 0x39, 0xf7, 0x83,
+	0xdb, 0x08, 0xfd, 0x0f, 0xe0, 0xda, 0x0f, 0x6e, 0x9d, 0x49, 0xb0, 0x5a, 0x50, 0x31, 0xe5, 0x06,
+	0x43, 0xba, 0x0c, 0x40, 0x5f, 0x41, 0x85, 0x09, 0x91, 0x5c, 0xe2, 0xab, 0xd4, 0x3a, 0x4e, 0x3e,
+	0x17, 0x98, 0x35, 0x8e, 0x75, 0x4a, 0x0d, 0x2a, 0xda, 0x7c, 0x49, 0x3f, 0xbf, 0x7c, 0x03, 0xed,
+	0x7c, 0x54, 0x54, 0x87, 0xad, 0x9f, 0x4d, 0xdd, 0x90, 0x0a, 0xa8, 0x01, 0x95, 0x81, 0xa6, 0x5e,
+	0x69, 0x52, 0x11, 0x01, 0x54, 0x19, 0x78, 0x75, 0x2a, 0x95, 0x4e, 0x7e, 0xa9, 0x41, 0xe5, 0xec,
+	0xcc, 0xf2, 0xe6, 0xe8, 0x35, 0xd4, 0xc4, 0x3e, 0xa0, 0x6d, 0x51, 0x02, 0xf7, 0x7a, 0xf0, 0x58,
+	0x48, 0xb9, 0x6d, 0x51, 0x0a, 0xe8, 0x39, 0x54, 0xfb, 0x84, 0xb2, 0x2f, 0x83, 0x3c, 0x3f, 0xbd,
+	0xe8, 0x3e, 0x55, 0x0a, 0xe8, 0x15, 0xc0, 0x30, 0xb8, 0x25, 0x61, 0xb0, 0xd8, 0x64, 0xee, 0x08,
+	0x29, 0x19, 0xa3, 0x52, 0x40, 0xc7, 0xd0, 0xb4, 0x66, 0x2b, 0x3a, 0x0d, 0x6e, 0x1f, 0xc6, 0xff,
+	0x16, 0x1a, 0x98, 0x8c, 0x83, 0x80, 0x3e, 0x88, 0xfd, 0x0d, 0xd4, 0x58, 0xca, 0xec, 0x6f, 0x28,
+	0xcf, 0x6d, 0xae, 0xa7, 0x1c, 0x29, 0x05, 0xb6, 0x04, 0x31, 0x0f, 0x6d, 0x8e, 0xff, 0x20, 0xf3,
+	0x8f, 0xa5, 0x14, 0xd0, 0x1b, 0x68, 0x5a, 0x84, 0xa6, 0x2b, 0x9c, 0x04, 0x4d, 0x80, 0x83, 0xbb,
+	0x80, 0x52, 0x40, 0xa7, 0x99, 0x1a, 0xef, 0x0f, 0x71, 0x4f, 0xea, 0x27, 0xeb, 0x3e, 0x3e, 0xd8,
+	0xe6, 0x7b, 0xd8, 0xc6, 0x24, 0xa2, 0x6e, 0x48, 0x35, 0x77, 0x19, 0xf8, 0x0f, 0xb4, 0x3a, 0x85,
+	0xa6, 0xb0, 0xea, 0xcd, 0x26, 0xcb, 0x07, 0x1a, 0x9d, 0xc1, 0x9e, 0x45, 0xa8, 0xb9, 0x58, 0xf1,
+	0x23, 0xa6, 0x2f, 0xa6, 0xde, 0xc4, 0x65, 0x6b, 0x88, 0xf6, 0xd7, 0xe6, 0xd9, 0xfb, 0xf6, 0x0f,
+	0x3e, 0x7c, 0xfa, 0x45, 0x1f, 0xf9, 0x1b, 0x79, 0x9f, 0x8f, 0x57, 0x50, 0xef, 0x13, 0x1a, 0xbf,
+	0x5b, 0xf7, 0x64, 0x9e, 0x4c, 0x9d, 0x13, 0x94, 0x02, 0x7a, 0x0b, 0x3b, 0xdd, 0x99, 0xbb, 0xb8,
+	0x21, 0xec, 0x04, 0xc4, 0x9f, 0x61, 0x48, 0x50, 0x32, 0x47, 0xe1, 0xbe, 0x40, 0x17, 0xf0, 0xa4,
+	0xcf, 0x0b, 0xde, 0xfc, 0x68, 0xba, 0x27, 0xee, 0xd3, 0x35, 0xb4, 0xc1, 0x57, 0x0a, 0xe3, 0x2a,
+	0xff, 0xb6, 0x3f, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x36, 0x31, 0x9e, 0x48, 0x3a, 0x0c, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConnInterface
+var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
+const _ = grpc.SupportPackageIsVersion4
 
 // BBSimClient is the client API for BBSim service.
 //
@@ -1150,10 +1157,10 @@
 }
 
 type bBSimClient struct {
-	cc grpc.ClientConnInterface
+	cc *grpc.ClientConn
 }
 
-func NewBBSimClient(cc grpc.ClientConnInterface) BBSimClient {
+func NewBBSimClient(cc *grpc.ClientConn) BBSimClient {
 	return &bBSimClient{cc}
 }
 
@@ -1331,62 +1338,6 @@
 	GetOnuTrafficSchedulers(context.Context, *ONURequest) (*ONUTrafficSchedulers, error)
 }
 
-// UnimplementedBBSimServer can be embedded to have forward compatible implementations.
-type UnimplementedBBSimServer struct {
-}
-
-func (*UnimplementedBBSimServer) Version(ctx context.Context, req *Empty) (*VersionNumber, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
-}
-func (*UnimplementedBBSimServer) GetOlt(ctx context.Context, req *Empty) (*Olt, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetOlt not implemented")
-}
-func (*UnimplementedBBSimServer) PoweronOlt(ctx context.Context, req *Empty) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method PoweronOlt not implemented")
-}
-func (*UnimplementedBBSimServer) ShutdownOlt(ctx context.Context, req *Empty) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ShutdownOlt not implemented")
-}
-func (*UnimplementedBBSimServer) RebootOlt(ctx context.Context, req *Empty) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RebootOlt not implemented")
-}
-func (*UnimplementedBBSimServer) GetONUs(ctx context.Context, req *Empty) (*ONUs, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetONUs not implemented")
-}
-func (*UnimplementedBBSimServer) GetONU(ctx context.Context, req *ONURequest) (*ONU, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetONU not implemented")
-}
-func (*UnimplementedBBSimServer) SetLogLevel(ctx context.Context, req *LogLevel) (*LogLevel, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetLogLevel not implemented")
-}
-func (*UnimplementedBBSimServer) ShutdownONU(ctx context.Context, req *ONURequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ShutdownONU not implemented")
-}
-func (*UnimplementedBBSimServer) PoweronONU(ctx context.Context, req *ONURequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method PoweronONU not implemented")
-}
-func (*UnimplementedBBSimServer) RestartEapol(ctx context.Context, req *ONURequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RestartEapol not implemented")
-}
-func (*UnimplementedBBSimServer) RestartDhcp(ctx context.Context, req *ONURequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RestartDhcp not implemented")
-}
-func (*UnimplementedBBSimServer) SetOnuAlarmIndication(ctx context.Context, req *ONUAlarmRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetOnuAlarmIndication not implemented")
-}
-func (*UnimplementedBBSimServer) SetOltAlarmIndication(ctx context.Context, req *OLTAlarmRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetOltAlarmIndication not implemented")
-}
-func (*UnimplementedBBSimServer) GetFlows(ctx context.Context, req *ONURequest) (*Flows, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetFlows not implemented")
-}
-func (*UnimplementedBBSimServer) ChangeIgmpState(ctx context.Context, req *IgmpRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ChangeIgmpState not implemented")
-}
-func (*UnimplementedBBSimServer) GetOnuTrafficSchedulers(ctx context.Context, req *ONURequest) (*ONUTrafficSchedulers, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetOnuTrafficSchedulers not implemented")
-}
-
 func RegisterBBSimServer(s *grpc.Server, srv BBSimServer) {
 	s.RegisterService(&_BBSim_serviceDesc, srv)
 }
diff --git a/api/bbsim/bbsim.pb.gw.go b/api/bbsim/bbsim.pb.gw.go
index f02b22f..b96f904 100644
--- a/api/bbsim/bbsim.pb.gw.go
+++ b/api/bbsim/bbsim.pb.gw.go
@@ -13,7 +13,6 @@
 	"io"
 	"net/http"
 
-	"github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/utilities"
@@ -23,13 +22,11 @@
 	"google.golang.org/grpc/status"
 )
 
-// Suppress "imported and not used" errors
 var _ codes.Code
 var _ io.Reader
 var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
-var _ = descriptor.ForMessage
 
 func request_BBSim_Version_0(ctx context.Context, marshaler runtime.Marshaler, client BBSimClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq Empty
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index d862c54..5167f2c 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -34,6 +34,7 @@
     string SerialNumber = 2;
     string OperState = 3;
     string InternalState = 4;
+    string IP = 7;
     repeated NNIPort NNIPorts = 5;
     repeated PONPort PONPorts = 6;
 }
diff --git a/internal/bbsim/api/grpc_api_server.go b/internal/bbsim/api/grpc_api_server.go
index 7191c2e..c17c6a9 100644
--- a/internal/bbsim/api/grpc_api_server.go
+++ b/internal/bbsim/api/grpc_api_server.go
@@ -19,6 +19,7 @@
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/opencord/bbsim/api/bbsim"
 	"github.com/opencord/bbsim/internal/bbsim/alarmsim"
@@ -73,11 +74,17 @@
 		pons = append(pons, &p)
 	}
 
+	oltAddress := strings.Split(common.Options.BBSim.OpenOltAddress, ":")[0]
+	if oltAddress == "" {
+		oltAddress = getOltIP().String()
+	}
+
 	res := bbsim.Olt{
 		ID:            int32(olt.ID),
 		SerialNumber:  olt.SerialNumber,
 		OperState:     olt.OperState.Current(),
 		InternalState: olt.InternalState.Current(),
+		IP:            oltAddress,
 		NNIPorts:      nnis,
 		PONPorts:      pons,
 	}
diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index 8a0d01e..4aafaba 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -1188,3 +1188,21 @@
 	o.channel <- msg
 	return nil
 }
+
+func getOltIP() net.IP {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		oltLogger.Error(err.Error())
+		return net.IP{}
+	}
+	defer func() {
+		err := conn.Close()
+		if err != nil {
+			oltLogger.Error(err.Error())
+		}
+	}()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP
+}
diff --git a/internal/bbsimctl/commands/olt.go b/internal/bbsimctl/commands/olt.go
index f1553db..3ea004c 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 }}"
+	DEFAULT_OLT_DEVICE_HEADER_FORMAT = "table{{ .ID }}\t{{ .SerialNumber }}\t{{ .OperState }}\t{{ .InternalState }}\t{{ .IP }}"
 	DEFAULT_PORT_HEADER_FORMAT       = "table{{ .ID }}\t{{ .OperState }}"
 )
 
diff --git a/internal/common/options.go b/internal/common/options.go
index f1f5f0a..6724d1f 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -160,6 +160,10 @@
 	pon := flag.Int("pon", int(conf.Olt.PonPorts), "Number of PON ports per OLT device to be emulated")
 	onu := flag.Int("onu", int(conf.Olt.OnusPonPort), "Number of ONU devices per PON port to be emulated")
 
+	openolt_address := flag.String("openolt_address", conf.BBSim.OpenOltAddress, "IP address:port")
+	api_address := flag.String("api_address", conf.BBSim.ApiAddress, "IP address:port")
+	rest_api_address := flag.String("rest_api_address", conf.BBSim.RestApiAddress, "IP address:port")
+
 	s_tag := flag.Int("s_tag", conf.BBSim.STag, "S-Tag initial value")
 	c_tag_init := flag.Int("c_tag", conf.BBSim.CTagInit, "C-Tag starting value, each ONU will get a sequential one (targeting 1024 ONUs per BBSim instance the range is big enough)")
 
@@ -195,6 +199,9 @@
 	conf.BBSim.EnablePerf = *enablePerf
 	conf.BBSim.Events = *enableEvents
 	conf.BBSim.KafkaAddress = *kafkaAddress
+	conf.BBSim.OpenOltAddress = *openolt_address
+	conf.BBSim.ApiAddress = *api_address
+	conf.BBSim.RestApiAddress = *rest_api_address
 
 	// update device id if not set
 	if conf.Olt.DeviceId == "" {