AMBARI-4274. ambari-agent unit test failures.(vbrodetskyi)

ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py

@@ -159,7 +159,7 @@ class PuppetExecutor:
         java64_home = str(command['hostLevelParams']['java_home']).strip()
       if java64_home is None or not self.isJavaAvailable(java64_home):
         if java64_home is None:
-          errMsg = "Cannot access JDK! Make sure java_home is specified in global config"
+          errMsg = "Cannot access JDK! Make sure java_home is specified in hostLevelParams"
         else:
           errMsg = JAVANOTVALID_MSG.format(java64_home)
         return {'stdout': '', 'stderr': errMsg, 'exitcode': 1}

ambari-agent/src/main/python/ambari_agent/test.json

@@ -13,7 +13,7 @@
 {
 "hdfs_user" : "hdfs",
 "jdk_location" : "http://hdp1/downloads",
-
+"java_home" : " java64_home ",
 "java32_home" : "/usr/jdk64/jdk1.6.0_31",
 "java64_home" : "/usr/jdk64/jdk1.6.0_31",
 "jdk_bins" :  { "32" : "jdk-6u31-linux-x64.bin", "64" : "jdk-6u31-linux-x64.bin" },

ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py

@@ -98,7 +98,7 @@ class TestPuppetExecutor(TestCase):
     puppetInstance.reposInstalled = False
     isJavaAvailableMock.return_value = False
     parsedJson['roleCommand'] = "START"
-    parsedJson['configurations'] = {'global':{'java64_home':'/usr/jdk/jdk123'}}
+    parsedJson['hostLevelParams'] = {'java_home':'/usr/jdk/jdk123'}
     res = puppetInstance.runCommand(parsedJson, tmpdir + '/out.txt', tmpdir + '/err.txt')
     
     JAVANOTVALID_MSG = "Cannot access JDK! Make sure you have permission to execute {0}/bin/java"
@@ -107,10 +107,10 @@ class TestPuppetExecutor(TestCase):
     self.assertEquals(res["stderr"], errMsg)
     self.assertFalse(puppetInstance.reposInstalled)
 
-    parsedJson['configurations'] = {'random':{'name1':'value2'}}
+    parsedJson['hostLevelParams'] = {'random':{'name1':'value2'}}
     res = puppetInstance.runCommand(parsedJson, tmpdir + '/out.txt', tmpdir + '/err.txt')
     self.assertEquals(res["exitcode"], 1)
-    self.assertEquals(res["stderr"], "Cannot access JDK! Make sure java64_home is specified in global config")
+    self.assertEquals(res["stderr"], "Cannot access JDK! Make sure java_home is specified in hostLevelParams")
 
 
   @patch.object(PuppetExecutor, 'isJavaAvailable')