Merge pull request #227 from pridhiviraj/tb_fix

Few fixes

Author: stewartsmith

common/OpTestIPMI.py

@@ -1423,3 +1423,9 @@ def is_tpm_enabled(self):
         elif "State Asserted" in res:
             print "#TPM is enabled"
             return True
+
+    def disable_sensor_polling(self):
+        self.ipmitool.run("raw 0x30 0x70 0xdf 0")
+
+    def enable_sensor_polling(self):
+        self.ipmitool.run("raw 0x30 0x70 0xdf 1")

testcases/OpalSysfsTests.py

@@ -40,6 +40,7 @@ def setUp(self):
         self.cv_HOST = conf.host()
         self.cv_IPMI = conf.ipmi()
         self.cv_SYSTEM = conf.system()
+        self.bmc_type = conf.args.bmc_type
 
     def get_proc_gen(self):
         try:
@@ -69,6 +70,16 @@ def set_power_cap(self, value):
             time.sleep(2)
         self.assertTrue((int(cur_powercap) == int(value)), "OPAL failed to set power cap value")
 
+    def disable_sensor_polling(self):
+        if "SMC" in self.bmc_type :
+            self.cv_IPMI.disable_sensor_polling()
+        return
+
+    def enable_sensor_polling(self):
+        if "SMC" in self.bmc_type :
+            self.cv_IPMI.enable_sensor_polling()
+        return
+
     def test_opal_powercap(self):
         self.setup_test()
         self.c.run_command("stty cols 300; stty rows 30;")
@@ -79,13 +90,15 @@ def test_opal_powercap(self):
         max_powercap = self.c.run_command("cat %s" % str(POWERCAP_MAX))[-1]
         min_powercap = self.c.run_command("cat %s" % str(POWERCAP_MIN))[-1]
 
+        self.disable_sensor_polling()
         print cur_powercap, max_powercap, min_powercap
         for i in range(3):
             value = random.randint(int(min_powercap), int(max_powercap))
             self.set_power_cap(value)
         # Set back to cur_powercap
         self.set_power_cap(cur_powercap)
 
+        self.enable_sensor_polling()
 
     def test_opal_psr(self):
         self.setup_test()

testcases/TrustedBoot.py

@@ -22,6 +22,15 @@
 # and also a secureboot mode enabled/disabled accordingly.
 # If TPM chip is installed --> provide --trusted-mode in command line
 # If secureboot is enabled --> provide --secure-mode in command line
+#
+# The "TPM Required" policy means:
+# enabled: Node must have at least 1 functional TPM to boot, otherwise system will terminate
+# disabled: Node can boot without a functional TPM
+# ==================
+# If system has a working TPM, the policy is a don't care.  If secure mode is not enabled, the policy is a don't care.
+# if you set policy to "enabled" and remove/inject error on TPM -and- system is in secure mode,  system boot will terminate
+# if you set policy to disable and remove/inject error on the TPM -and- system is in secure mode, system will still boot
+#
 
 import unittest
 import pexpect
@@ -105,7 +114,9 @@ def verify_dt_tb(self):
         c.run_command("ls %s/link-id" % tpm_path)
 
     def tearDown(self):
-        self.cv_SYSTEM.sys_enable_tpm()
+        if self.securemode and not self.trustedmode:
+            self.cv_SYSTEM.sys_disable_tpm()
+        return
 
 class VerifyOPALTrustedBoot(TrustedBoot):
     '''