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={
: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 \
as-value keep-result=no];

View file

@ -13,7 +13,7 @@
:local i [:resolve $s];
# 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
:local u [/tool fetch url=("https://$s") mode=https http-method=get \

View file

@ -13,7 +13,7 @@
:local IpAddress [:resolve $SiteName];
# 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
: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
# list of web sites.
:global Filename "ch10-04-bad-script.rsc";
# function to log error message
:global LogMessageFunc do={
:global Filename;
@ -21,7 +18,7 @@
# check arg type str of correct length passed
if (([:typeof $WebSiteName]!="str") or \
([:len $WebSiteName] < 6)) do={
([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!");
}
@ -50,7 +47,7 @@
# check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={
([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!");
}

View file

@ -1,4 +1,4 @@
# filename: ch10-05-error-check.rsc
# ch10-05-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
# filename: ch10-09-simple-pause.rsc
# ch10-09-simple-pause.rsc
# A simple script that includes a 2 second pause

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 Mikrotik router interface

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 Mikrotik router interface

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 Mikrotik router interface

View file

@ -4,7 +4,7 @@
:foreach s in=$w do={
: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 \
as-value keep-result=no];

View file

@ -13,7 +13,7 @@
:local i [:resolve $s];
# 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
:local u [/tool fetch url=("https://$s") mode=https http-method=get \

View file

@ -13,7 +13,7 @@
:local IpAddress [:resolve $SiteName];
# 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
: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
# list of web sites.
:global Filename "ch10-04-bad-script.rsc";
# function to log error message
:global LogMessageFunc do={
:global Filename;
@ -21,7 +18,7 @@
# check arg type str of correct length passed
if (([:typeof $WebSiteName]!="str") or \
([:len $WebSiteName] < 6)) do={
([:len value=$WebSiteName] < 6)) do={
$LogMessageFunc ("DnsResolveFunc: arg value $WebSiteName not \
a valid string!");
}
@ -50,7 +47,7 @@
# check arg type str of correct length passed
if (([:typeof $SiteName] != "str") or \
([:len $SiteName] < 6)) do={
([:len value=$SiteName] < 6)) do={
$LogMessageFunc ("GetWebPageFunc: arg value $SiteName not a \
valid string!");
}

View file

@ -1,4 +1,4 @@
# filename: ch10-05-error-check.rsc
# ch10-05-error-check.rsc
:local WebSites { "badname1234.com"; "google.com"};
:foreach SiteName in=$WebSites do={

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
# filename: ch10-09-simple-pause.rsc
# ch10-09-simple-pause.rsc
# A simple script that includes a 2 second pause

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 Mikrotik router interface

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 Mikrotik router interface

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 Mikrotik router interface