aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlas Kozat <ulas.kozat@gmail.com>2016-06-09 10:58:30 -0700
committerUlas Kozat <ulas.kozat@gmail.com>2016-06-09 10:58:30 -0700
commit4b29a244a43340e9758941222fdbc75060c5f279 (patch)
tree9fe7d3a67ef5381ca03ac07cf705eced4c1b7065
parent83e4e86f94ce37458f69712d3e295e128446232b (diff)
using miscutil.read_templatefile(temp_filename) function in domino client
Change-Id: I9862a2c50ac7ba24bfc5708eb7ba06ca2419f199 Signed-off-by: Ulas Kozat <ulas.kozat@gmail.com>
-rwxr-xr-xDominoClient.py7
-rw-r--r--lib/util/miscutil.py2
2 files changed, 2 insertions, 7 deletions
diff --git a/DominoClient.py b/DominoClient.py
index 9cdcc39..8ce8ae7 100755
--- a/DominoClient.py
+++ b/DominoClient.py
@@ -118,11 +118,6 @@ class CLIHandler:
CLIrespmsg.CLI_response = "Testing..."
return CLIrespmsg
-def read_templatefile(temp_filename):
- f = open(temp_filename, 'r')
- lines = f.read().splitlines()
-
- return lines
class DominoClientCLIService(threading.Thread):
def __init__(self, dominoclient, communicationhandler, interactive):
@@ -315,7 +310,7 @@ class DominoClient:
pub_msg.template_type = 'tosca-nfv-v1.0'
try:
- pub_msg.template = read_templatefile(toscafile)
+ pub_msg.template = miscutil.read_templatefile(toscafile)
except IOError as e:
logging.error('I/O error(%d): %s' , e.errno, e.strerror)
return
diff --git a/lib/util/miscutil.py b/lib/util/miscutil.py
index 4afa565..ea284af 100644
--- a/lib/util/miscutil.py
+++ b/lib/util/miscutil.py
@@ -7,6 +7,6 @@
def read_templatefile(temp_filename):
f = open(temp_filename, 'r')
lines = f.read().splitlines()
-
+ f.close()
return lines