change related parameter names, change nested endpoints

Yoyasp · Yoyasp · commit 4dd9d43fb81d · 2026-04-17T12:33:31.000+02:00
diff --git a/app/Restify/CefSwitchingRepository.php b/app/Restify/CefSwitchingRepository.php
@@ -16,6 +16,8 @@ class CefSwitchingRepository extends Repository
 
     public static string $model = CefSwitching::class;
 
+    public static string $uriKey = 'cef-switching';
+
     public static string $id = 'cef_switching_id';
 
     public static string $title = 'cef_path';
diff --git a/app/Restify/DeviceRepository.php b/app/Restify/DeviceRepository.php
@@ -3,7 +3,6 @@
 namespace App\Restify;
 
 use App\Models\Device;
-use App\Models\Location;
 use Binaryk\LaravelRestify\Fields\BelongsTo;
 use Binaryk\LaravelRestify\Fields\BelongsToMany;
 use Binaryk\LaravelRestify\Fields\HasMany;
@@ -31,18 +30,49 @@ public static function related(): array
             'ports' => HasMany::make('ports', PortRepository::class),
             'sensors' => HasMany::make('sensors', SensorRepository::class),
             'processors' => HasMany::make('processors', ProcessorRepository::class),
-            'mempools' => HasMany::make('mempools', MempoolRepository::class),
+            'memory-pools' => HasMany::make('mempools', MempoolRepository::class)->label('memory-pools'),
             'storage' => HasMany::make('storage', StorageRepository::class),
             'services' => HasMany::make('services', ServiceRepository::class),
-            'bgpPeers' => HasMany::make('bgpPeers', BgpPeerRepository::class),
+            'bgp-peers' => HasMany::make('bgpPeers', BgpPeerRepository::class)->label('bgp-peers'),
             'components' => HasMany::make('components', ComponentRepository::class),
             'applications' => HasMany::make('applications', ApplicationRepository::class),
             'inventory' => HasMany::make('entityPhysical', InventoryRepository::class),
             'eventlogs' => HasMany::make('eventlogs', EventlogRepository::class),
             'syslogs' => HasMany::make('syslogs', SyslogRepository::class),
-            'alertLogs' => HasMany::make('alertLogs', AlertLogRepository::class),
+            'alert-logs' => HasMany::make('alertLogs', AlertLogRepository::class)->label('alert-logs'),
             'location' => BelongsTo::make('location', LocationRepository::class),
             'groups' => BelongsToMany::make('groups', DeviceGroupRepository::class),
+            'alerts' => HasMany::make('alerts', AlertRepository::class),
+            'outages' => HasMany::make('outages', DeviceOutageRepository::class),
+            'links' => HasMany::make('links', LinkRepository::class),
+            'vlans' => HasMany::make('vlans', VlanRepository::class),
+            'vrfs' => HasMany::make('vrfs', VrfRepository::class),
+            'vrf-lite' => HasMany::make('vrfLites', VrfLiteRepository::class)->label('vrf-lite'),
+            'routes' => HasMany::make('routes', RouteRepository::class),
+            'access-points' => HasMany::make('accessPoints', AccessPointRepository::class)->label('access-points'),
+            'wireless-sensors' => HasMany::make('wirelessSensors', WirelessSensorRepository::class)->label('wireless-sensors'),
+            'disk-io' => HasMany::make('diskIo', DiskIoRepository::class)->label('disk-io'),
+            'service-level-agreements' => HasMany::make('slas', SlaRepository::class)->label('service-level-agreements'),
+            'cef-switching' => HasMany::make('cefSwitching', CefSwitchingRepository::class)->label('cef-switching'),
+            'spanning-trees' => HasMany::make('stpInstances', StpRepository::class)->label('spanning-trees'),
+            'ipsec-tunnels' => HasMany::make('ipsecTunnels', IpsecTunnelRepository::class)->label('ipsec-tunnels'),
+            'isis-adjacencies' => HasMany::make('isisAdjacencies', IsisAdjacencyRepository::class)->label('isis-adjacencies'),
+            'ospf-instances' => HasMany::make('ospfInstances', OspfInstanceRepository::class)->label('ospf-instances'),
+            'ospf-areas' => HasMany::make('ospfAreas', OspfAreaRepository::class)->label('ospf-areas'),
+            'ospf-neighbors' => HasMany::make('ospfNbrs', OspfNbrRepository::class)->label('ospf-neighbors'),
+            'ospf-ports' => HasMany::make('ospfPorts', OspfPortRepository::class)->label('ospf-ports'),
+            'ospfv3-instances' => HasMany::make('ospfv3Instances', Ospfv3InstanceRepository::class)->label('ospfv3-instances'),
+            'ospfv3-areas' => HasMany::make('ospfv3Areas', Ospfv3AreaRepository::class)->label('ospfv3-areas'),
+            'ospfv3-neighbors' => HasMany::make('ospfv3Nbrs', Ospfv3NbrRepository::class)->label('ospfv3-neighbors'),
+            'ospfv3-ports' => HasMany::make('ospfv3Ports', Ospfv3PortRepository::class)->label('ospfv3-ports'),
+            'mpls-label-switched-paths' => HasMany::make('mplsLsps', MplsLspRepository::class)->label('mpls-label-switched-paths'),
+            'mpls-label-switched-path-routes' => HasMany::make('mplsLspPaths', MplsLspPathRepository::class)->label('mpls-label-switched-path-routes'),
+            'mpls-service-distribution-points' => HasMany::make('mplsSdps', MplsSdpRepository::class)->label('mpls-service-distribution-points'),
+            'mpls-service-distribution-point-bindings' => HasMany::make('mplsSdpBinds', MplsSdpBindRepository::class)->label('mpls-service-distribution-point-bindings'),
+            'mpls-service-access-points' => HasMany::make('mplsSaps', MplsSapRepository::class)->label('mpls-service-access-points'),
+            'mpls-services' => HasMany::make('mplsServices', MplsServiceRepository::class)->label('mpls-services'),
+            'mpls-tunnel-actual-route-hops' => HasMany::make('mplsTunnelArHops', MplsTunnelArHopRepository::class)->label('mpls-tunnel-actual-route-hops'),
+            'mpls-tunnel-computed-hops' => HasMany::make('mplsTunnelCHops', MplsTunnelCHopRepository::class)->label('mpls-tunnel-computed-hops'),
         ];
     }
 
diff --git a/app/Restify/DiskIoRepository.php b/app/Restify/DiskIoRepository.php
@@ -16,6 +16,8 @@ class DiskIoRepository extends Repository
 
     public static string $model = DiskIo::class;
 
+    public static string $uriKey = 'disk-io';
+
     public static string $id = 'diskio_id';
 
     public static string $title = 'diskio_descr';
diff --git a/app/Restify/Ipv4MacRepository.php b/app/Restify/Ipv4MacRepository.php
@@ -15,6 +15,8 @@ class Ipv4MacRepository extends Repository
 
     public static string $model = Ipv4Mac::class;
 
+    public static string $uriKey = 'ipv4-mac-addresses';
+
     public static string $title = 'ipv4_address';
 
 
diff --git a/app/Restify/Ipv6NdRepository.php b/app/Restify/Ipv6NdRepository.php
@@ -16,6 +16,8 @@ class Ipv6NdRepository extends Repository
 {
     public static string $model = Ipv6Nd::class;
 
+    public static string $uriKey = 'ipv6-neighbor-discovery';
+
     public static string $title = 'ipv6_address';
 
 
diff --git a/app/Restify/MempoolRepository.php b/app/Restify/MempoolRepository.php
@@ -16,6 +16,8 @@ class MempoolRepository extends Repository
 
     public static string $model = Mempool::class;
 
+    public static string $uriKey = 'memory-pools';
+
     public static string $id = 'mempool_id';
 
     public static string $title = 'mempool_descr';
diff --git a/app/Restify/MplsLspPathRepository.php b/app/Restify/MplsLspPathRepository.php
@@ -16,6 +16,8 @@ class MplsLspPathRepository extends Repository
 
     public static string $model = MplsLspPath::class;
 
+    public static string $uriKey = 'mpls-label-switched-path-routes';
+
     public static string $id = 'lsp_path_id';
 
     public static string $title = 'mplsLspPathType';
@@ -27,7 +29,7 @@ public static function related(): array
     {
         return [
             'device' => BelongsTo::make('device', DeviceRepository::class),
-            'lsp' => BelongsTo::make('lsp', MplsLspRepository::class),
+            'label-switched-path' => BelongsTo::make('lsp', MplsLspRepository::class)->label('label-switched-path'),
         ];
     }
 
diff --git a/app/Restify/MplsLspRepository.php b/app/Restify/MplsLspRepository.php
@@ -16,6 +16,8 @@ class MplsLspRepository extends Repository
 
     public static string $model = MplsLsp::class;
 
+    public static string $uriKey = 'mpls-label-switched-paths';
+
     public static string $id = 'lsp_id';
 
     public static string $title = 'mplsLspName';
diff --git a/app/Restify/MplsSapRepository.php b/app/Restify/MplsSapRepository.php
@@ -16,6 +16,8 @@ class MplsSapRepository extends Repository
 
     public static string $model = MplsSap::class;
 
+    public static string $uriKey = 'mpls-service-access-points';
+
     public static string $id = 'sap_id';
 
     public static string $title = 'sapDescription';
diff --git a/app/Restify/MplsSdpBindRepository.php b/app/Restify/MplsSdpBindRepository.php
@@ -16,6 +16,8 @@ class MplsSdpBindRepository extends Repository
 
     public static string $model = MplsSdpBind::class;
 
+    public static string $uriKey = 'mpls-service-distribution-point-bindings';
+
     public static string $id = 'bind_id';
 
     public static string $title = 'bind_id';
@@ -26,7 +28,7 @@ public static function related(): array
     {
         return [
             'device' => BelongsTo::make('device', DeviceRepository::class),
-            'sdp' => BelongsTo::make('sdp', MplsSdpRepository::class),
+            'service-distribution-point' => BelongsTo::make('sdp', MplsSdpRepository::class)->label('service-distribution-point'),
             'service' => BelongsTo::make('service', MplsServiceRepository::class),
         ];
     }
diff --git a/app/Restify/MplsSdpRepository.php b/app/Restify/MplsSdpRepository.php
@@ -16,6 +16,8 @@ class MplsSdpRepository extends Repository
 
     public static string $model = MplsSdp::class;
 
+    public static string $uriKey = 'mpls-service-distribution-points';
+
     public static string $id = 'sdp_id';
 
     public static string $title = 'sdpDescription';
diff --git a/app/Restify/MplsTunnelArHopRepository.php b/app/Restify/MplsTunnelArHopRepository.php
@@ -16,6 +16,8 @@ class MplsTunnelArHopRepository extends Repository
 
     public static string $model = MplsTunnelArHop::class;
 
+    public static string $uriKey = 'mpls-tunnel-actual-route-hops';
+
     public static string $id = 'ar_hop_id';
 
     public static string $title = 'mplsTunnelARHopIpv4Addr';
@@ -27,7 +29,7 @@ public static function related(): array
     {
         return [
             'device' => BelongsTo::make('device', DeviceRepository::class),
-            'lspPath' => BelongsTo::make('lspPath', MplsLspPathRepository::class),
+            'label-switched-path-route' => BelongsTo::make('lspPath', MplsLspPathRepository::class)->label('label-switched-path-route'),
         ];
     }
 
diff --git a/app/Restify/MplsTunnelCHopRepository.php b/app/Restify/MplsTunnelCHopRepository.php
@@ -16,6 +16,8 @@ class MplsTunnelCHopRepository extends Repository
 
     public static string $model = MplsTunnelCHop::class;
 
+    public static string $uriKey = 'mpls-tunnel-computed-hops';
+
     public static string $id = 'c_hop_id';
 
     public static string $title = 'mplsTunnelCHopIpv4Addr';
@@ -27,7 +29,7 @@ public static function related(): array
     {
         return [
             'device' => BelongsTo::make('device', DeviceRepository::class),
-            'lspPath' => BelongsTo::make('lspPath', MplsLspPathRepository::class),
+            'label-switched-path-route' => BelongsTo::make('lspPath', MplsLspPathRepository::class)->label('label-switched-path-route'),
         ];
     }
 
diff --git a/app/Restify/OspfNbrRepository.php b/app/Restify/OspfNbrRepository.php
@@ -16,6 +16,8 @@ class OspfNbrRepository extends Repository
 
     public static string $model = OspfNbr::class;
 
+    public static string $uriKey = 'ospf-neighbors';
+
     public static string $title = 'ospfNbrIpAddr';
 
 
diff --git a/app/Restify/Ospfv3NbrRepository.php b/app/Restify/Ospfv3NbrRepository.php
@@ -16,6 +16,8 @@ class Ospfv3NbrRepository extends Repository
 
     public static string $model = Ospfv3Nbr::class;
 
+    public static string $uriKey = 'ospfv3-neighbors';
+
     public static string $title = 'ospfv3NbrRtrId';
 
 
diff --git a/app/Restify/PortAdslRepository.php b/app/Restify/PortAdslRepository.php
@@ -15,6 +15,8 @@ class PortAdslRepository extends Repository
 
     public static string $model = PortAdsl::class;
 
+    public static string $uriKey = 'port-adsl';
+
     public static string $id = 'port_id';
 
     public static string $title = 'adslLineCoding';
diff --git a/app/Restify/PortRepository.php b/app/Restify/PortRepository.php
@@ -5,6 +5,8 @@
 use App\Models\Port;
 use Binaryk\LaravelRestify\Fields\BelongsTo;
 use Binaryk\LaravelRestify\Fields\BelongsToMany;
+use Binaryk\LaravelRestify\Fields\HasMany;
+use Binaryk\LaravelRestify\Fields\HasOne;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Filters\MatchFilter;
 use Binaryk\LaravelRestify\Filters\SearchableFilter;
@@ -28,6 +30,17 @@ public static function related(): array
         return [
             'device' => BelongsTo::make('device', DeviceRepository::class),
             'groups' => BelongsToMany::make('groups', PortGroupRepository::class),
+            'ipv4-addresses' => HasMany::make('ipv4', Ipv4AddressRepository::class)->label('ipv4-addresses'),
+            'ipv6-addresses' => HasMany::make('ipv6', Ipv6AddressRepository::class)->label('ipv6-addresses'),
+            'forwarding-database-entries' => HasMany::make('fdbEntries', PortsFdbRepository::class)->label('forwarding-database-entries'),
+            'network-access-controls' => HasMany::make('nac', PortsNacRepository::class)->label('network-access-controls'),
+            'neighbor-discovery' => HasMany::make('nd', Ipv6NdRepository::class)->label('neighbor-discovery'),
+            'vlans' => HasMany::make('vlans', PortVlanRepository::class),
+            'statistics' => HasMany::make('statistics', PortStatisticRepository::class),
+            'spanning-tree' => HasMany::make('stp', PortStpRepository::class)->label('spanning-tree'),
+            'transceivers' => HasMany::make('transceivers', TransceiverRepository::class),
+            'adsl' => HasOne::make('adsl', PortAdslRepository::class),
+            'vdsl' => HasOne::make('vdsl', PortVdslRepository::class),
         ];
     }
 
diff --git a/app/Restify/PortStpRepository.php b/app/Restify/PortStpRepository.php
@@ -15,6 +15,8 @@ class PortStpRepository extends Repository
 
     public static string $model = PortStp::class;
 
+    public static string $uriKey = 'port-spanning-trees';
+
     public static string $id = 'port_stp_id';
 
     public static string $title = 'state';
diff --git a/app/Restify/PortVdslRepository.php b/app/Restify/PortVdslRepository.php
@@ -15,6 +15,8 @@ class PortVdslRepository extends Repository
 
     public static string $model = PortVdsl::class;
 
+    public static string $uriKey = 'port-vdsl';
+
     public static string $id = 'port_id';
 
     public static string $title = 'port_id';
diff --git a/app/Restify/PortsFdbRepository.php b/app/Restify/PortsFdbRepository.php
@@ -16,6 +16,8 @@ class PortsFdbRepository extends Repository
 
     public static string $model = PortsFdb::class;
 
+    public static string $uriKey = 'port-forwarding-database-entries';
+
     public static string $id = 'ports_fdb_id';
 
     public static string $title = 'mac_address';
diff --git a/app/Restify/PortsNacRepository.php b/app/Restify/PortsNacRepository.php
@@ -15,6 +15,8 @@ class PortsNacRepository extends Repository
 
     public static string $model = PortsNac::class;
 
+    public static string $uriKey = 'port-network-access-controls';
+
     public static string $id = 'ports_nac_id';
 
     public static string $title = 'username';
diff --git a/app/Restify/SlaRepository.php b/app/Restify/SlaRepository.php
@@ -16,6 +16,8 @@ class SlaRepository extends Repository
 
     public static string $model = Sla::class;
 
+    public static string $uriKey = 'service-level-agreements';
+
     public static string $id = 'sla_id';
 
     public static string $title = 'tag';
diff --git a/app/Restify/StpRepository.php b/app/Restify/StpRepository.php
@@ -16,6 +16,8 @@ class StpRepository extends Repository
 
     public static string $model = Stp::class;
 
+    public static string $uriKey = 'spanning-trees';
+
     public static string $id = 'stp_id';
 
     public static string $title = 'bridgeAddress';
diff --git a/app/Restify/UserRepository.php b/app/Restify/UserRepository.php
@@ -25,8 +25,8 @@ class UserRepository extends Repository
     public static function related(): array
     {
         return [
-            'devicesOwned' => BelongsToMany::make('devicesOwned', DeviceRepository::class),
-            'portsOwned' => BelongsToMany::make('portsOwned', PortRepository::class),
+            'devices-owned' => BelongsToMany::make('devicesOwned', DeviceRepository::class)->label('devices-owned'),
+            'ports-owned' => BelongsToMany::make('portsOwned', PortRepository::class)->label('ports-owned'),
         ];
     }
 
diff --git a/app/Restify/VrfLiteRepository.php b/app/Restify/VrfLiteRepository.php
@@ -16,6 +16,8 @@ class VrfLiteRepository extends Repository
 
     public static string $model = VrfLite::class;
 
+    public static string $uriKey = 'vrf-lite';
+
     public static string $id = 'vrf_lite_cisco_id';
 
     public static string $title = 'vrf_name';
diff --git a/tests/Feature/Api/RestifyApiTest.php b/tests/Feature/Api/RestifyApiTest.php
diff --git a/tests/Feature/Api/RestifyNestedRoutesTest.php b/tests/Feature/Api/RestifyNestedRoutesTest.php
diff --git a/tests/Feature/Api/RestifyRelationshipsTest.php b/tests/Feature/Api/RestifyRelationshipsTest.php

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class Ipv6NdRepository extends Repository`
`16`	`16`	`{`
`17`	`17`	`public static string $model = Ipv6Nd::class;`
`18`	`18`
	`19`	`+ public static string $uriKey = 'ipv6-neighbor-discovery';`
	`20`	`+`
`19`	`21`	`public static string $title = 'ipv6_address';`
`20`	`22`
`21`	`23`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class MplsLspPathRepository extends Repository`
`16`	`16`
`17`	`17`	`public static string $model = MplsLspPath::class;`
`18`	`18`
	`19`	`+ public static string $uriKey = 'mpls-label-switched-path-routes';`
	`20`	`+`
`19`	`21`	`public static string $id = 'lsp_path_id';`
`20`	`22`
`21`	`23`	`public static string $title = 'mplsLspPathType';`
`@@ -27,7 +29,7 @@ public static function related(): array`
`27`	`29`	`{`
`28`	`30`	`return [`
`29`	`31`	`'device' => BelongsTo::make('device', DeviceRepository::class),`
`30`		`- 'lsp' => BelongsTo::make('lsp', MplsLspRepository::class),`
	`32`	`+ 'label-switched-path' => BelongsTo::make('lsp', MplsLspRepository::class)->label('label-switched-path'),`
`31`	`33`	`];`
`32`	`34`	`}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class MplsSdpBindRepository extends Repository`
`16`	`16`
`17`	`17`	`public static string $model = MplsSdpBind::class;`
`18`	`18`
	`19`	`+ public static string $uriKey = 'mpls-service-distribution-point-bindings';`
	`20`	`+`
`19`	`21`	`public static string $id = 'bind_id';`
`20`	`22`
`21`	`23`	`public static string $title = 'bind_id';`
`@@ -26,7 +28,7 @@ public static function related(): array`
`26`	`28`	`{`
`27`	`29`	`return [`
`28`	`30`	`'device' => BelongsTo::make('device', DeviceRepository::class),`
`29`		`- 'sdp' => BelongsTo::make('sdp', MplsSdpRepository::class),`
	`31`	`+ 'service-distribution-point' => BelongsTo::make('sdp', MplsSdpRepository::class)->label('service-distribution-point'),`
`30`	`32`	`'service' => BelongsTo::make('service', MplsServiceRepository::class),`
`31`	`33`	`];`
`32`	`34`	`}`