Compare commits

..

No commits in common. "master" and "v1.03" have entirely different histories.

24 changed files with 59 additions and 77 deletions

View file

@ -4,7 +4,7 @@
:foreach s in=$w do={ :foreach s in=$w do={
:local i [:resolve $s]; :local i [:resolve $s];
:local p [/ping $i count=3]; :local p [/ping $i count=3 ];
:local u [/tool fetch url=("https://$s") mode=https http-method=get \ :local u [/tool fetch url=("https://$s") mode=https http-method=get \
as-value keep-result=no]; as-value keep-result=no];

View file

@ -13,7 +13,7 @@
:local i [:resolve $s]; :local i [:resolve $s];
# try pinging the IP address of this site # try pinging the IP address of this site
:local p [/ping $i count=3]; :local p [/ping $i count=3 ];
# try fetching the web page of this site # try fetching the web page of this site
:local u [/tool fetch url=("https://$s") mode=https http-method=get \ :local u [/tool fetch url=("https://$s") mode=https http-method=get \

View file

@ -13,7 +13,7 @@
:local IpAddress [:resolve $SiteName]; :local IpAddress [:resolve $SiteName];
# try pinging the IP address of this site # try pinging the IP address of this site
:local PingResult [/ping $IpAddress count=3]; :local PingResult [/ping $IpAddress count=3 ];
# try getting the web page of this site # try getting the web page of this site
:local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \ :local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \

View file

@ -1,10 +1,7 @@
# filename: ch10-04-bad-script.rsc :global Filename "ch10-04-bad-script.rsc"
#
# A simple script to perform a series of tests on a # A simple script to perform a series of tests on a
# list of web sites. # list of web sites.
:global Filename "ch10-04-bad-script.rsc";
# function to log error message # function to log error message
:global LogMessageFunc do={ :global LogMessageFunc do={
:global Filename; :global Filename;
@ -21,7 +18,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $WebSiteName]!="str") or \ if (([:typeof $WebSiteName]!="str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!"); a valid string!");
} }
@ -50,7 +47,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \ if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
} }

View file

@ -1,7 +1,7 @@
# filename: ch10-05-error-check.rsc # ch10-05-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"}; :local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={ :foreach SiteName in=$WebSites do={
:local SiteIpAddress [:resolve $SiteName]; :local SiteIpAddress [:resolve $SiteName];
:put "Site IP for $SiteName is $SiteIpAddress"; :put "Site IP for $SiteName is $SiteIpAddress";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-06-error-check.rsc # ch10-06-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"}; :local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={ :foreach SiteName in=$WebSites do={
:do { :do {
@ -7,4 +7,4 @@
} on-error={ } on-error={
:put "Name lookup failed for $SiteName"; :put "Name lookup failed for $SiteName";
} }
} }

View file

@ -1,9 +1,6 @@
# filename: ch10-07-bad-script.rsc :global Filename "ch10-07-bad-script.rsc"
# # A script to perform a series of tests on a
# A simple script to perform a series of tests on a # list of web sites.
# list of web sites.
:global Filename "ch10-07-bad-script.rsc";
# function to log error messages # function to log error messages
:global LogMessageFunc do={ :global LogMessageFunc do={
@ -21,7 +18,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
:if (([:typeof $WebSiteName] != "str") or \ :if (([:typeof $WebSiteName] != "str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!"); a valid string!");
@ -67,7 +64,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
:if (([:typeof $SiteName] != "str") or \ :if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
:return "*** test failed ***"; :return "*** test failed ***";

View file

@ -1,10 +1,7 @@
# filename: ch10-08-bad-script.rsc :global Filename "ch10-08-bad-script.rsc"
# # A script to perform a series of tests on a
# A simple script to perform a series of tests on a
# list of web sites. # list of web sites.
:global Filename "ch10-08-bad-script.rsc";
# set DEBUG to "true" for script debugging output, # set DEBUG to "true" for script debugging output,
# "false" for normal operation # "false" for normal operation
:global DEBUG false; :global DEBUG false;
@ -37,7 +34,7 @@
$DebugFunc "Checking arg data type is correct"; $DebugFunc "Checking arg data type is correct";
:if (([:typeof $WebSiteName] != "str") or \ :if (([:typeof $WebSiteName] != "str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
:local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \ :local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \
not a valid string!"; not a valid string!";
$LogMessageFunc $ErrorMsg; $LogMessageFunc $ErrorMsg;
@ -88,10 +85,10 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \ if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
:return { "duration"="*** test failed ***" } :return { "duration"="*** test failed ***" };
} }
do { do {
@ -100,7 +97,7 @@
} on-error { } on-error {
$LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \
$SiteName !"); $SiteName !");
:return { "duration"="*** test failed ***" } return { "duration"="*** test failed ***" };
} }
} }

View file

@ -1,7 +1,7 @@
# filename: ch10-09-simple-pause.rsc # ch10-09-simple-pause.rsc
# A simple script that includes a 2 second pause # A simple script that includes a 2 second pause
:put "Hello we're going to pause now..."; :put "Hello we're going to pause now...";
:delay 2; :delay 2;
:put "Pause complete. We're all done now!"; :put "Pause complete. We're all done now!";

View file

@ -1,4 +1,4 @@
# filename: ch10-10-add-remove-vlans.rsc # ch10-10-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/fromon-error={ # a script to add and remove 50 VLANs to/fromon-error={
# a Mikrotik router interface # a Mikrotik router interface
@ -24,4 +24,4 @@
# add VLAN to LAN interface # add VLAN to LAN interface
:local VlanName "VLAN$VlanId"; :local VlanName "VLAN$VlanId";
/interface vlan remove "$VlanName"; /interface vlan remove "$VlanName";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-11-add-remove-vlans.rsc # ch10-11-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/from # a script to add and remove 50 VLANs to/from
# a Mikrotik router interface # a Mikrotik router interface
@ -20,4 +20,4 @@
# add VLAN to LAN interface # add VLAN to LAN interface
:local VlanName "VLAN$VlanId"; :local VlanName "VLAN$VlanId";
/interface vlan remove "$VlanName"; /interface vlan remove "$VlanName";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-12-add-remove-vlans.rsc # ch10-12-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/from # a script to add and remove 50 VLANs to/from
# a Mikrotik router interface # a Mikrotik router interface
@ -28,4 +28,4 @@
} }
}]; }];
:put "Remove loop time: $RemoveLoopTime"; :put "Remove loop time: $RemoveLoopTime";

View file

@ -4,7 +4,7 @@
:foreach s in=$w do={ :foreach s in=$w do={
:local i [:resolve $s]; :local i [:resolve $s];
:local p [/ping $i count=3]; :local p [/ping $i count=3 ];
:local u [/tool fetch url=("https://$s") mode=https http-method=get \ :local u [/tool fetch url=("https://$s") mode=https http-method=get \
as-value keep-result=no]; as-value keep-result=no];

View file

@ -13,7 +13,7 @@
:local i [:resolve $s]; :local i [:resolve $s];
# try pinging the IP address of this site # try pinging the IP address of this site
:local p [/ping $i count=3]; :local p [/ping $i count=3 ];
# try fetching the web page of this site # try fetching the web page of this site
:local u [/tool fetch url=("https://$s") mode=https http-method=get \ :local u [/tool fetch url=("https://$s") mode=https http-method=get \

View file

@ -13,7 +13,7 @@
:local IpAddress [:resolve $SiteName]; :local IpAddress [:resolve $SiteName];
# try pinging the IP address of this site # try pinging the IP address of this site
:local PingResult [/ping $IpAddress count=3]; :local PingResult [/ping $IpAddress count=3 ];
# try getting the web page of this site # try getting the web page of this site
:local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \ :local UrlFetch [/tool fetch url=("https://$SiteName") mode=https \

View file

@ -1,9 +1,6 @@
# filename: ch10-04-bad-script.rsc :global Filename "ch10-04-bad-script.rsc"
#
# A simple script to perform a series of tests on a # A simple script to perform a series of tests on a
# list of web sites. # list of web sites.
:global Filename "ch10-04-bad-script.rsc";
# function to log error message # function to log error message
:global LogMessageFunc do={ :global LogMessageFunc do={
@ -21,7 +18,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $WebSiteName]!="str") or \ if (([:typeof $WebSiteName]!="str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!"); a valid string!");
} }
@ -50,7 +47,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \ if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
} }

View file

@ -1,7 +1,7 @@
# filename: ch10-05-error-check.rsc # ch10-05-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"}; :local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={ :foreach SiteName in=$WebSites do={
:local SiteIpAddress [:resolve $SiteName]; :local SiteIpAddress [:resolve $SiteName];
:put "Site IP for $SiteName is $SiteIpAddress"; :put "Site IP for $SiteName is $SiteIpAddress";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-06-error-check.rsc # ch10-06-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"}; :local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={ :foreach SiteName in=$WebSites do={
:do { :do {
@ -7,4 +7,4 @@
} on-error={ } on-error={
:put "Name lookup failed for $SiteName"; :put "Name lookup failed for $SiteName";
} }
} }

View file

@ -1,9 +1,6 @@
# filename: ch10-07-bad-script.rsc :global Filename "ch10-07-bad-script.rsc"
# # A script to perform a series of tests on a
# A simple script to perform a series of tests on a # list of web sites.
# list of web sites.
:global Filename "ch10-07-bad-script.rsc";
# function to log error messages # function to log error messages
:global LogMessageFunc do={ :global LogMessageFunc do={
@ -21,7 +18,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
:if (([:typeof $WebSiteName] != "str") or \ :if (([:typeof $WebSiteName] != "str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \ $LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!"); a valid string!");
@ -67,7 +64,7 @@
# check arg type str of correct length passed # check arg type str of correct length passed
:if (([:typeof $SiteName] != "str") or \ :if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
:return "*** test failed ***"; :return "*** test failed ***";

View file

@ -1,10 +1,7 @@
# filename: ch10-08-bad-script.rsc :global Filename "ch10-08-bad-script.rsc"
# # A script to perform a series of tests on a
# A simple script to perform a series of tests on a
# list of web sites. # list of web sites.
:global Filename "ch10-08-bad-script.rsc";
# set DEBUG to "true" for script debugging output, # set DEBUG to "true" for script debugging output,
# "false" for normal operation # "false" for normal operation
:global DEBUG false; :global DEBUG false;
@ -37,7 +34,7 @@
$DebugFunc "Checking arg data type is correct"; $DebugFunc "Checking arg data type is correct";
:if (([:typeof $WebSiteName] != "str") or \ :if (([:typeof $WebSiteName] != "str") or \
([:len $WebSiteName] < 6)) do={ ([:len value=$WebSiteName] < 6)) do={
:local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \ :local ErrorMsg "DnsResolveFunc: arg value $WebSiteName \
not a valid string!"; not a valid string!";
$LogMessageFunc $ErrorMsg; $LogMessageFunc $ErrorMsg;
@ -88,10 +85,10 @@
# check arg type str of correct length passed # check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \ if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={ ([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \ $LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!"); valid string!");
:return { "duration"="*** test failed ***" } :return { "duration"="*** test failed ***" };
} }
do { do {
@ -100,7 +97,7 @@
} on-error { } on-error {
$LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \ $LogMessageFunc ("GetWebPageFunc: unable to retrieve site: \
$SiteName !"); $SiteName !");
:return { "duration"="*** test failed ***" } return { "duration"="*** test failed ***" };
} }
} }

View file

@ -1,7 +1,7 @@
# filename: ch10-09-simple-pause.rsc # ch10-09-simple-pause.rsc
# A simple script that includes a 2 second pause # A simple script that includes a 2 second pause
:put "Hello we're going to pause now..."; :put "Hello we're going to pause now...";
:delay 2; :delay 2;
:put "Pause complete. We're all done now!"; :put "Pause complete. We're all done now!";

View file

@ -1,4 +1,4 @@
# filename: ch10-10-add-remove-vlans.rsc # ch10-10-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/from # a script to add and remove 50 VLANs to/from
# a Mikrotik router interface # a Mikrotik router interface
@ -24,4 +24,4 @@
# add VLAN to LAN interface # add VLAN to LAN interface
:local VlanName "VLAN$VlanId"; :local VlanName "VLAN$VlanId";
/interface/vlan remove "$VlanName"; /interface/vlan remove "$VlanName";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-11-add-remove-vlans.rsc # ch10-11-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/from # a script to add and remove 50 VLANs to/from
# a Mikrotik router interface # a Mikrotik router interface
@ -20,4 +20,4 @@
# add VLAN to LAN interface # add VLAN to LAN interface
:local VlanName "VLAN$VlanId"; :local VlanName "VLAN$VlanId";
/interface vlan remove "$VlanName"; /interface vlan remove "$VlanName";
} }

View file

@ -1,4 +1,4 @@
# filename: ch10-12-add-remove-vlans.rsc # ch10-12-add-remove-vlans.rsc
# a script to add and remove 50 VLANs to/from # a script to add and remove 50 VLANs to/from
# a Mikrotik router interface # a Mikrotik router interface
@ -28,4 +28,4 @@
} }
}]; }];
:put "Remove loop time: $RemoveLoopTime"; :put "Remove loop time: $RemoveLoopTime";