Fix few issues seen in run.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
(cherry picked from commit 80121f6be7)

test/integration/smoke/test_deploy_vm_root_resize.py

@@ -81,7 +81,7 @@ class TestDeployVM(cloudstackTestCase):
         self.testdata["mode"] = self.zone.networktype
         self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
         if self.template == FAILED:
-            assert False, "get_template() failed to return template with description %s" % self.services["ostype"]
+            assert False, "get_template() failed to return template "
 #       for testing with specific template
 #        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
         

tools/marvin/marvin/configGenerator.py

@@ -377,7 +377,7 @@ class ConfigManager(object):
                 config_dict = test_data
             else:
                 configLines = []
-                with open(file, 'r') as fp:
+                with open(self.__filePath, 'r') as fp:
                     for line in fp:
                         ws = line.strip()
                         if not ws.startswith("#"):