etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

testing: improve vmware ssvm test (#4262) 

Add sleep before ssvm health check script is run on reboot

Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
This commit is contained in:
Pearl Dsilva 2020-08-15 23:06:22 +05:30 committed by GitHub
parent b586eb22f1
commit c383269a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemvm/agent/scripts/ssvm-check.sh
View File

@ -118,7 +118,7 @@ fi
# check for connectivity to the management server # check for connectivity to the management server
echo ================================================ echo ================================================
echo Management server is $MGMTSERVER. Checking connectivity. echo Management server is $MGMTSERVER. Checking connectivity.
socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1) socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 | tr -d '\0' 2>&1)
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "Good: Can connect to management server port 8250" echo "Good: Can connect to management server port 8250"
@ -141,6 +141,6 @@ else
fi fi
echo ================================================ echo ================================================
echo Tests Complete. Look for ERROR or WARNING above. echo Tests Complete. Look for ERROR or WARNING above.
exit 0 exit 0

2
test/integration/smoke/test_ssvm.py
View File

@ -874,6 +874,8 @@ class TestSSVMs(cloudstackTestCase):
# Wait for the agent to be up # Wait for the agent to be up
self.waitForSystemVMAgent(ssvm_response.name) self.waitForSystemVMAgent(ssvm_response.name)
# Wait until NFS stores mounted before running the script
time.sleep(30)
# Call to verify cloud process is running # Call to verify cloud process is running
self.test_03_ssvm_internals() self.test_03_ssvm_internals()