From fee89f30ee3bfd694392bff8dfc1b9a75c28683b Mon Sep 17 00:00:00 2001 From: Paul Rock Date: Sun, 28 Jun 2020 20:28:25 +0300 Subject: [PATCH] Usage of legacy methods removed from all examples --- examples/bridge_hosts.php | 2 +- examples/different_queries.php | 6 +++--- examples/export.php | 23 ++++++++++++++++++++++- examples/interface_print.php | 2 +- examples/ip_address_print.php | 2 +- examples/ip_filrewall_address-list_print.php | 2 +- examples/queue_simple_print.php | 2 +- examples/queue_simple_print_v2.php | 2 +- examples/queue_simple_write.php | 4 ++-- examples/system_package_print.php | 2 +- examples/vlans_bridge.php | 6 +++--- examples/vlans_bridge_v2.php | 6 +++--- examples/vlans_bridge_v3.php | 6 +++--- 13 files changed, 43 insertions(+), 22 deletions(-) diff --git a/examples/bridge_hosts.php b/examples/bridge_hosts.php index 0cf2130..05edd53 100644 --- a/examples/bridge_hosts.php +++ b/examples/bridge_hosts.php @@ -22,5 +22,5 @@ $client = new Client($config); $query = new Query('/interface/bridge/host/print'); // Send query to RouterOS -$response = $client->write($query)->read(); +$response = $client->query($query)->read(); print_r($response); diff --git a/examples/different_queries.php b/examples/different_queries.php index 2ea45af..b8c49bd 100644 --- a/examples/different_queries.php +++ b/examples/different_queries.php @@ -14,12 +14,12 @@ $client = new Client([ ]); for ($i = 0; $i < 10; $i++) { - $response = $client->wr('/ip/address/print'); + $response = $client->qr('/ip/address/print'); print_r($response); - $response = $client->wr('/ip/arp/print'); + $response = $client->qr('/ip/arp/print'); print_r($response); - $response = $client->wr('/interface/print'); + $response = $client->qr('/interface/print'); print_r($response); } diff --git a/examples/export.php b/examples/export.php index 0ff790a..c2621fc 100644 --- a/examples/export.php +++ b/examples/export.php @@ -20,5 +20,26 @@ $client = new Client($config); // Execute export command via ssh $response = $client->export(); +dump($response); -print_r($response); +/* +// In results you will see something like this + +# jun/28/2020 16:31:21 by RouterOS 6.47 +# software id = +# +# +# +/interface wireless security-profiles +set [ find default=yes ] supplicant-identity=MikroTik +/ip dhcp-client +add disabled=no interface=ether1 + + */ + +// But here is another example +$query = new Query('/export'); + +// Execute export command via ssh but in style of library +$response = $client->query($query)->read(); +dump($response); diff --git a/examples/interface_print.php b/examples/interface_print.php index 355ab16..dca7d9f 100644 --- a/examples/interface_print.php +++ b/examples/interface_print.php @@ -21,7 +21,7 @@ $client = new Client($config); $query = new Query('/interface/getall'); // Send query to RouterOS -$request = $client->write($query); +$request = $client->query($query); // Read answer from RouterOS $response = $client->read(); diff --git a/examples/ip_address_print.php b/examples/ip_address_print.php index 50b9b6e..1e8dc40 100644 --- a/examples/ip_address_print.php +++ b/examples/ip_address_print.php @@ -18,5 +18,5 @@ $client = new Client([ $query = new Query('/ip/address/print'); // Send query to RouterOS -$response = $client->write($query)->read(); +$response = $client->query($query)->read(); print_r($response); diff --git a/examples/ip_filrewall_address-list_print.php b/examples/ip_filrewall_address-list_print.php index 6b17fe4..e8f7e76 100644 --- a/examples/ip_filrewall_address-list_print.php +++ b/examples/ip_filrewall_address-list_print.php @@ -14,7 +14,7 @@ $client = new Client([ ]); // Send query to RouterOS and parse response -$response = $client->write('/ip/firewall/address-list/print')->read(); +$response = $client->query('/ip/firewall/address-list/print')->read(); // You could treat response as an array except using array_* function diff --git a/examples/queue_simple_print.php b/examples/queue_simple_print.php index f827487..3c8ced6 100644 --- a/examples/queue_simple_print.php +++ b/examples/queue_simple_print.php @@ -25,6 +25,6 @@ $ips = [ foreach ($ips as $ip) { $query = new Query('/queue/simple/print', ['?target=' . $ip . '/32']); - $response = $client->wr($query); + $response = $client->qr($query); print_r($response); } diff --git a/examples/queue_simple_print_v2.php b/examples/queue_simple_print_v2.php index da396db..0e966a0 100644 --- a/examples/queue_simple_print_v2.php +++ b/examples/queue_simple_print_v2.php @@ -24,7 +24,7 @@ $ips = [ ]; foreach ($ips as $ip) { - $response = $client->wr([ + $response = $client->qr([ '/queue/simple/print', '?target=' . $ip . '/32' ]); diff --git a/examples/queue_simple_write.php b/examples/queue_simple_write.php index 62e23b8..8696a4c 100644 --- a/examples/queue_simple_write.php +++ b/examples/queue_simple_write.php @@ -12,8 +12,8 @@ $client = new Client([ 'pass' => 'admin' ]); -$out = $client->write(['/queue/simple/add', '=name=test'])->read(); +$out = $client->query(['/queue/simple/add', '=name=test'])->read(); print_r($out); -$out = $client->write(['/queue/simple/add', '=name=test'])->read(); +$out = $client->query(['/queue/simple/add', '=name=test'])->read(); print_r($out); diff --git a/examples/system_package_print.php b/examples/system_package_print.php index e19d507..8cd114c 100644 --- a/examples/system_package_print.php +++ b/examples/system_package_print.php @@ -21,7 +21,7 @@ $client = new Client($config); $query = new Query('/system/package/print'); // Send query to RouterOS -$request = $client->write($query); +$request = $client->query($query); // Read answer from RouterOS $response = $client->read(); diff --git a/examples/vlans_bridge.php b/examples/vlans_bridge.php index c1e014a..b22f912 100644 --- a/examples/vlans_bridge.php +++ b/examples/vlans_bridge.php @@ -35,14 +35,14 @@ foreach ($vlans as $vlanId => $ports) { // Add bridges $query = new Query('/interface/bridge/add'); $query->add("=name=vlan$vlanId-bridge")->add('vlan-filtering=no'); - $response = $client->write($query)->read(); + $response = $client->query($query)->read(); print_r($response); // Add ports to bridge foreach ($ports as $port) { $bridgePort = new Query('/interface/bridge/port/add'); $bridgePort->add("=bridge=vlan$vlanId-bridge")->add("=pvid=$vlanId")->add("=interface=ether$port"); - $response = $client->write($bridgePort)->read(); + $response = $client->query($bridgePort)->read(); print_r($response); } @@ -50,7 +50,7 @@ foreach ($vlans as $vlanId => $ports) { foreach ($ports as $port) { $vlan = new Query('/interface/bridge/vlan/add'); $vlan->add("=bridge=vlan$vlanId-bridge")->add("=untagged=ether$port")->add("=vlan-ids=$vlanId"); - $response = $client->write($vlan)->read(false); + $response = $client->query($vlan)->read(false); print_r($response); } diff --git a/examples/vlans_bridge_v2.php b/examples/vlans_bridge_v2.php index b6e5bdb..664cf7e 100644 --- a/examples/vlans_bridge_v2.php +++ b/examples/vlans_bridge_v2.php @@ -34,7 +34,7 @@ foreach ($vlans as $vlanId => $ports) { 'vlan-filtering=no' ]); - $response = $client->wr($query); + $response = $client->qr($query); print_r($response); // Add ports to bridge @@ -45,7 +45,7 @@ foreach ($vlans as $vlanId => $ports) { "=interface=ether$port" ]); - $response = $client->wr($bridgePort); + $response = $client->qr($bridgePort); print_r($response); } @@ -57,7 +57,7 @@ foreach ($vlans as $vlanId => $ports) { "=vlan-ids=$vlanId" ]); - $response = $client->wr($vlan); + $response = $client->qr($vlan); print_r($response); } diff --git a/examples/vlans_bridge_v3.php b/examples/vlans_bridge_v3.php index 3b01301..339537b 100644 --- a/examples/vlans_bridge_v3.php +++ b/examples/vlans_bridge_v3.php @@ -28,7 +28,7 @@ $vlans = [ foreach ($vlans as $vlanId => $ports) { // Add bridges - $response = $client->wr([ + $response = $client->qr([ '/interface/bridge/add', "=name=vlan$vlanId-bridge", 'vlan-filtering=no' @@ -37,7 +37,7 @@ foreach ($vlans as $vlanId => $ports) { // Add ports to bridge foreach ($ports as $port) { - $response = $client->wr([ + $response = $client->qr([ '/interface/bridge/port/add', "=bridge=vlan$vlanId-bridge", "=pvid=$vlanId", @@ -48,7 +48,7 @@ foreach ($vlans as $vlanId => $ports) { // Add untagged ports to bridge with tagging foreach ($ports as $port) { - $response = $client->wr([ + $response = $client->qr([ '/interface/bridge/vlan/add', "=bridge=vlan$vlanId-bridge", "=untagged=ether$port",