From bb127ecc6d000dc95ebcfa9296ae10cd16ac205f Mon Sep 17 00:00:00 2001 From: Vlad Vitan Date: Tue, 13 Aug 2024 15:00:30 +0200 Subject: [PATCH] dr: Update end device model fields in provisioning info --- pkg/devicerepository/store/remote/remote.go | 9 ++-- .../store/remote/remote_test.go | 54 +++---------------- 2 files changed, 11 insertions(+), 52 deletions(-) diff --git a/pkg/devicerepository/store/remote/remote.go b/pkg/devicerepository/store/remote/remote.go index e18b18e2bc..7002f95a56 100644 --- a/pkg/devicerepository/store/remote/remote.go +++ b/pkg/devicerepository/store/remote/remote.go @@ -339,11 +339,12 @@ func (s *remoteStore) GetProvisioningInfo(req store.GetProvisioningInfoRequest) BrandID: brandID, ModelID: vendorProfile.EndDeviceId, Paths: []string{ - "brand_id", - "model_id", "name", - "firmware_versions", - "hardware_versions", + "description", + "key_provisioning", + "photos", + "product_url", + "datasheet_url", }, }) if err != nil { diff --git a/pkg/devicerepository/store/remote/remote_test.go b/pkg/devicerepository/store/remote/remote_test.go index 520776ab5a..54dc79bd4c 100644 --- a/pkg/devicerepository/store/remote/remote_test.go +++ b/pkg/devicerepository/store/remote/remote_test.go @@ -46,54 +46,12 @@ func TestRemoteStore(t *testing.T) { a.So(provisioningInfo, should.Resemble, &store.GetProvisioningInfoResponse{ ProvisioningInfo: &ttnpb.EndDeviceProvisioningInfo{ EndDeviceModel: &ttnpb.EndDeviceModel{ - BrandId: "repo-example", - ModelId: "windsensor", - Name: "Wind Sensor", - HardwareVersions: []*ttnpb.EndDeviceModel_HardwareVersion{ - {Version: "1.0", Numeric: 1}, - {Version: "1.0-rev-A", Numeric: 2}, - }, - FirmwareVersions: []*ttnpb.EndDeviceModel_FirmwareVersion{ - { - Version: "1.0", - Numeric: 1, - SupportedHardwareVersions: []string{"1.0"}, - Profiles: map[string]*ttnpb.EndDeviceModel_FirmwareVersion_Profile{ - "EU_863_870": { - VendorId: "repo-example", - ProfileId: "windsensor-profile", - LorawanCertified: true, - CodecId: "windsensor-codec", - }, - "US_902_928": { - ProfileId: "windsensor-profile", - LorawanCertified: true, - CodecId: "windsensor-codec", - }, - }, - }, - { - Version: "2.0", - Numeric: 2, - SupportedHardwareVersions: []string{"1.0-rev-A"}, - Profiles: map[string]*ttnpb.EndDeviceModel_FirmwareVersion_Profile{ - "EU_863_870": { - ProfileId: "windsensor-profile", - LorawanCertified: true, - CodecId: "windsensor-codec", - }, - "US_902_928": { - ProfileId: "windsensor-profile", - LorawanCertified: true, - CodecId: "windsensor-codec", - }, - "AS_923": { - ProfileId: "windsensor-profile", - CodecId: "windsensor-codec", - }, - }, - }, - }, + Name: "Wind Sensor", + Description: "Wind Sensor with controllable LED", + DatasheetUrl: "https://example.org/wind-sensor/datasheet.pdf", + KeyProvisioning: []ttnpb.KeyProvisioning{ttnpb.KeyProvisioning_KEY_PROVISIONING_CUSTOM, ttnpb.KeyProvisioning_KEY_PROVISIONING_JOIN_SERVER}, + Photos: &ttnpb.EndDeviceModel_Photos{Main: "windsensor.png", Other: []string{"windsensor-package.png"}}, + ProductUrl: "https://example.org/wind-sensor", }, EndDeviceTemplate: &ttnpb.EndDeviceTemplate{ EndDevice: &ttnpb.EndDevice{