diff options
-rw-r--r-- | geo-replication/gsyncd.conf.in | 4 | ||||
-rw-r--r-- | tests/00-geo-rep/00-georep-verify-non-root-setup.t | 16 | ||||
-rw-r--r-- | tests/00-geo-rep/georep-basic-dr-rsync.t | 13 |
3 files changed, 32 insertions, 1 deletions
diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in index 9155cd87bbe..11e57fdf54f 100644 --- a/geo-replication/gsyncd.conf.in +++ b/geo-replication/gsyncd.conf.in @@ -266,7 +266,9 @@ allowed_values=ERROR,INFO,WARNING,DEBUG [ssh-port] value=22 -validation=int +validation=minmax +min=1 +max=65535 help=Set SSH port type=int diff --git a/tests/00-geo-rep/00-georep-verify-non-root-setup.t b/tests/00-geo-rep/00-georep-verify-non-root-setup.t index ed7e589101d..27ed82732c9 100644 --- a/tests/00-geo-rep/00-georep-verify-non-root-setup.t +++ b/tests/00-geo-rep/00-georep-verify-non-root-setup.t @@ -223,6 +223,22 @@ TEST $GEOREP_CLI $master $slave_url resume #Validate failure of volume stop when geo-rep is running TEST ! $CLI volume stop $GMV0 +#Negative test for ssh-port +#Port should be integer and between 1-65535 range + +TEST ! $GEOREP_CLI $master $slave_url config ssh-port -22 + +TEST ! $GEOREP_CLI $master $slave_url config ssh-port abc + +TEST ! $GEOREP_CLI $master $slave_url config ssh-port 6875943 + +TEST ! $GEOREP_CLI $master $slave_url config ssh-port 4.5 + +TEST ! $GEOREP_CLI $master $slave_url config ssh-port 22a + +#Config Set ssh-port to validate int validation +TEST $GEOREP_CLI $master $slave config ssh-port 22 + #Hybrid directory rename test BZ#1763439 TEST $GEOREP_CLI $master $slave_url config change_detector xsync mkdir ${master_mnt}/dir1 diff --git a/tests/00-geo-rep/georep-basic-dr-rsync.t b/tests/00-geo-rep/georep-basic-dr-rsync.t index b6fbf1875f0..d785aa59fc9 100644 --- a/tests/00-geo-rep/georep-basic-dr-rsync.t +++ b/tests/00-geo-rep/georep-basic-dr-rsync.t @@ -71,6 +71,19 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 4 check_status_num_rows "Created" #Config gluster-command-dir TEST $GEOREP_CLI $master $slave config gluster-command-dir ${GLUSTER_CMD_DIR} +#Negative test for ssh-port +#Port should be integer and between 1-65535 range + +TEST ! $GEOREP_CLI $master $slave config ssh-port -22 + +TEST ! $GEOREP_CLI $master $slave config ssh-port abc + +TEST ! $GEOREP_CLI $master $slave config ssh-port 6875943 + +TEST ! $GEOREP_CLI $master $slave config ssh-port 4.5 + +TEST ! $GEOREP_CLI $master $slave config ssh-port 22a + #Config Set ssh-port to validate int validation TEST $GEOREP_CLI $master $slave config ssh-port 22 |