|
@@ -261,23 +261,30 @@ class NAS implements TenancyIdTraitInterface, DeviceInterface, LocationInterface
|
|
|
*/
|
|
|
public function getDeviceData()
|
|
|
{
|
|
|
- $deviceExtraData = [
|
|
|
- 'description' => $this->description,
|
|
|
- 'host' => $this->host,
|
|
|
- 'snmpComunity' => $this->snmpComunity,
|
|
|
- 'snmpVersion' => $this->snmpVersion,
|
|
|
- 'radiusPassword' => $this->radiusPassword,
|
|
|
- 'model' => $this->model ? $this->model->getId() : $this->model,
|
|
|
- 'acctEnabled' => $this->acctEnabled,
|
|
|
- ];
|
|
|
-
|
|
|
- return [
|
|
|
- 'deviceType' => get_class($this),
|
|
|
- 'deviceId' => $this->id,
|
|
|
- 'ip' => null,
|
|
|
- 'tenancy' => $this->tenancyId,
|
|
|
- 'extraData' => json_encode($deviceExtraData),
|
|
|
- ];
|
|
|
+
|
|
|
+ $deviceData = array();
|
|
|
+ $deviceData['deviceType'] = get_class($this);
|
|
|
+ $deviceData['deviceId'] = $this->id;
|
|
|
+ $deviceData['ip'] = $this->host;
|
|
|
+ $deviceData['tenancy'] = $this->tenancyId;
|
|
|
+
|
|
|
+ $deviceExtraData = array('snmpCommunity' => $this->snmpCommunity, 'snmpVersion' => $this->snmpVersion, 'radiusPassword' => $this->radiusPassword,
|
|
|
+ 'acctEnabled' => $this->acctEnabled, 'description' => $this->description);
|
|
|
+
|
|
|
+ if ($this->model) {
|
|
|
+ $model = $this->getModel();
|
|
|
+ $deviceExtraData['modelId'] = $model->getId();
|
|
|
+ $deviceExtraData['library'] = $model->getLibrary();
|
|
|
+ } else {
|
|
|
+ $deviceExtraData['modelId'] = null;
|
|
|
+ $deviceExtraData['library'] = null;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ $deviceData['extraData'] = json_encode($deviceExtraData);
|
|
|
+
|
|
|
+ return $deviceData;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|