DeviceInfo changes for voltha rsrc_mgr
Change-Id: I2411d14d4810e063c6c7a6c0ce07b659f6d992f7
diff --git a/core/core_server.go b/core/core_server.go
index 48f0ed8..f00d72d 100644
--- a/core/core_server.go
+++ b/core/core_server.go
@@ -92,7 +92,7 @@
Vethnames: []string{},
IndInterval: opt.intvl,
Processes: []string{},
- EnableServer: new(openolt.Openolt_EnableIndicationServer),
+ EnableServer: nil,
state: INACTIVE,
stateChan: make(chan coreState, 8),
}
diff --git a/core/grpc_service.go b/core/grpc_service.go
index 61096f4..d833104 100644
--- a/core/grpc_service.go
+++ b/core/grpc_service.go
@@ -60,7 +60,7 @@
devinfo.HardwareVersion = ""
devinfo.FirmwareVersion = ""
devinfo.Technology = "xgspon"
- devinfo.PonPorts = 1
+ devinfo.PonPorts = 16
devinfo.OnuIdStart = 1
devinfo.OnuIdEnd = 255
devinfo.AllocIdStart = 1024
@@ -70,46 +70,6 @@
devinfo.FlowIdStart = 1
devinfo.FlowIdEnd = 16383
- /*
- for intf_id := 0; intf_id < 16; intf_id++ {
- r := new(openolt.DeviceInfo_DeviceResourceRanges)
-
- r.IntfIds = append(r.IntfIds, uint32(intf_id))
-
- r.Technology = "xgspon"
-
- p := new(openolt.DeviceInfo_DeviceResourceRanges_Pool)
- p.Type = openolt.DeviceInfo_DeviceResourceRanges_Pool_ONU_ID
- p.Sharing = openolt.DeviceInfo_DeviceResourceRanges_Pool_DEDICATED_PER_INTF
- p.Start = 1
- p.End = 255
- r.Pools = append(r.Pools, p)
-
- p = new(openolt.DeviceInfo_DeviceResourceRanges_Pool)
- p.Type = openolt.DeviceInfo_DeviceResourceRanges_Pool_ALLOC_ID
- p.Sharing = openolt.DeviceInfo_DeviceResourceRanges_Pool_SHARED_BY_ALL_INTF_SAME_TECH
- p.Start = 1024
- p.End = 16383
- r.Pools = append(r.Pools, p)
-
- p = new(openolt.DeviceInfo_DeviceResourceRanges_Pool)
- p.Type = openolt.DeviceInfo_DeviceResourceRanges_Pool_GEMPORT_ID
- p.Sharing = openolt.DeviceInfo_DeviceResourceRanges_Pool_SHARED_BY_ALL_INTF_ALL_TECH
- p.Start = 1024
- p.End = 65535
- r.Pools = append(r.Pools, p)
-
- p = new(openolt.DeviceInfo_DeviceResourceRanges_Pool)
- p.Type = openolt.DeviceInfo_DeviceResourceRanges_Pool_FLOW_ID
- p.Sharing = openolt.DeviceInfo_DeviceResourceRanges_Pool_SHARED_BY_ALL_INTF_ALL_TECH
- p.Start = 1
- p.End = 16383
- r.Pools = append(r.Pools, p)
-
- devinfo.Ranges = append(devinfo.Ranges, r)
- }
- */
-
return devinfo, nil
}