X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVatExecutor.py;h=63f46c8b6d7bf0c4258e90bbba249bd46243476f;hp=19b92a6a1a9bcc782811aece185795d9cc23fe91;hb=7829fea4a2c8936513fa95215b7d84997f814a69;hpb=063abf35e81deaf749ebbcfee339fbd1d9e89412

diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index 19b92a6a1a..63f46c8b6d 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -62,7 +62,7 @@ def get_vpp_pid(node):
         running on the DUT node.
     :rtype: int or list
     """
-    pid = PidLib.DUTSetup.get_vpp_pid(node)
+    pid = PidLib.DUTSetup.get_pid(node, u"vpp")
     return pid
 
 
@@ -113,7 +113,7 @@ class VatExecutor:
             ssh.scp(vat_name, vat_name)
             remote_file_path = vat_name
             if history:
-                with open(vat_name, "r") as vat_file:
+                with open(vat_name, u"rt") as vat_file:
                     for line in vat_file:
                         PapiHistory.add_to_papi_history(
                             node, line.replace(u"\n", u""), papi=False
@@ -155,7 +155,7 @@ class VatExecutor:
         :type timeout: int
         :type json_out: bool
         """
-        with open(tmp_fn, "w") as tmp_f:
+        with open(tmp_fn, u"wt") as tmp_f:
             tmp_f.writelines(commands)
 
         self.execute_script(
@@ -388,7 +388,7 @@ class VatTerminal:
         """
         file_path = f"{Constants.RESOURCES_TPL_VAT}/{vat_template_file}"
 
-        with open(file_path, "r") as template_file:
+        with open(file_path, u"rt") as template_file:
             cmd_template = template_file.readlines()
         ret = list()
         for line_tmpl in cmd_template: