Changeset 76330 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Dec 21, 2018 9:01:04 AM (6 years ago)

Author:

vboxsync

Message:

Get email From and iLOM pasword from config.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• batch/virtual_test_sheriff.py (modified) (6 diffs)
• config.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -45 +45 @@
 import subprocess;
 import smtplib
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.utils import COMMASPACE
+
 if sys.version_info[0] >= 3:
     from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
@@ -51 +55 @@
 from optparse import OptionParser;                  # pylint: disable=deprecated-module
 from PIL import Image;                              # pylint: disable=import-error
-
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.utils import COMMASPACE
 
 # Add Test Manager's modules path
@@ -71 +71 @@
 from testmanager.core.testresultfailures    import TestResultFailureLogic, TestResultFailureData;
 from testmanager.core.useraccount           import UserAccountLogic;
-from testmanager.config                     import g_ksSmtpHost, g_kcSmtpPort, g_ksAlertSubject, g_asAlertList;
+from testmanager.config                     import g_ksSmtpHost, g_kcSmtpPort, g_ksAlertFrom, \
+                                                   g_ksAlertSubject, g_asAlertList, g_ksLomPassword;
 
 # Python 3 hacks:
@@ -375 +376 @@
             sFrom = sFrom[0];
         else:
-            sFrom = '[email protected]';
+            sFrom = g_ksAlertFrom;
 
         for sUser in g_asAlertList:
@@ -517 +518 @@
                     continue;
             ## @todo get iLOM credentials from a table?
-            sCmd = 'sshpass -pchangeme ssh -oStrictHostKeyChecking=no root@%s show /SP && reset /SYS' % (oTestBox.ipLom,);
+            sCmd = 'sshpass -p%s ssh -oStrictHostKeyChecking=no root@%s show /SP && reset /SYS' % (g_ksLomPassword, oTestBox.ipLom,);
             try:
                 oPs = subprocess.Popen(sCmd, stdout=subprocess.PIPE, shell=True);
@@ -528 +529 @@
                 sComment = u'Reset testbox #%u (%s) - iRC=%u sStduot=%s' % ( idTestBox, oTestBox.sName, iRC, sStdout);
                 self.vprint(sComment);
-
                 self.emailAlert(self.uidSelf, sComment);
 

trunk/src/VBox/ValidationKit/testmanager/config.py

@@ -193 +193 @@
 ## SMTP server port number.
 g_kcSmtpPort            = 25;
+## Default email 'From' for email alert.
+g_ksAlertFrom           = '[email protected]';
 ## Subject for email alert.
 g_ksAlertSubject        = 'Virtual Sheriff alert';
 ## List of users to send alerts.
 g_asAlertList           = ['lelik', 'werner'];
-
-## @}
+## iLOM password.
+g_ksLomPassword         = 'password';
+
+## @}