return self.con.in_waiting
+ def line_in_buffer(self):
+ if b"\n" in self.buffer:
+ return True
+
+ return False
def readline2(self, pattern=None):
string = ""
print("We are not logged in")
return False
+ def print_lines_in_buffer(self):
+ while True:
+ self.log.debug("Fill buffer ...")
+ self.peek(len(self.buffer) + self.in_waiting)
+ self.log.debug("Current buffer length: {}".format(len(self.buffer)))
+ if self.line_in_buffer() == True:
+ while self.line_in_buffer() == True:
+ data = self.readline()
+ self.log_console_line(data.decode())
+ else:
+ self.log.debug("We have printed all lines in the buffer")
+ break
+
def login(self, password):
if self.username == None:
self.log.error("Username cannot be blank")
return False
+ self.print_lines_in_buffer()
+
# Hit enter to see what we get
self.con.write(b'\n')
# We get two new lines \r\n ?
data = self.readline()
self.log_console_line(data.decode())
+ self.print_lines_in_buffer()
if self.back_at_prompt():
self.log.debug("We are already logged in.")
# Read all line till we get login:
while 1:
- data = self.peek()
- if not data.decode() == "l":
- self.log.debug("We get no l at the start")
- self.log_console_line(self.readline().decode())
-
# We need to use self.in_waiting because with self.con.in_waiting we get
# not the complete string
size = len(self.buffer) + self.in_waiting
self.con.flush()
def command(self, command):
- self.write("{}\n".format(command))
+ self.write("{}; echo \"END: $?\"\n".format(command))
# We need to read out the prompt for this command first
# If we do not do this we will break the loop immediately
data = self.readline()
self.log_console_line(data.decode())
+ # We saved our exit code in data (the last line)
+ self.log.debug(data.decode())
+ data = data.decode().replace("END: ", "")
+ self.log.debug(data)
+ self.log.debug(data.strip())
+ return data.strip()
+
# A class which define and undefine a virtual network based on an xml file
class network():
# Should read the test, check if the syntax are valid
# and return tuples with the ( host, command ) structure
class recipe():
- def __init__(self, path):
+ def __init__(self, path, circle=[]):
self.log = log(4)
self.recipe_file = path
+ self.path = os.path.dirname(self.recipe_file)
+ self.log.debug("Path of recipe is: {}".format(self.recipe_file))
self._recipe = None
+ self.circle = circle
+ self.log.debug(circle)
+ self.log.debug(self.circle)
if not os.path.isfile(self.recipe_file):
self.log.error("No such file: {}".format(self.recipe_file))
if len(raw_line) < 2:
self.log.error("Error parsing the recipe in line {}".format(i))
raise RecipeExeption
- cmd = raw_line[1]
+ cmd = raw_line[1].strip()
raw_line = raw_line[0].strip().split(" ")
if len(raw_line) == 0:
self.log.error("Failed to parse the recipe in line {}".format(i))
raise RecipeExeption
- elif len(raw_line) == 1:
- if raw_line[0] == "":
+
+ if raw_line[0].strip() == "":
self.log.error("Failed to parse the recipe in line {}".format(i))
raise RecipeExeption
- machine = raw_line[0]
+
+ machine = raw_line[0].strip()
+
+ if len(raw_line) == 2:
+ extra = raw_line[1].strip()
+ else:
extra = ""
- elif len(raw_line) == 2:
- machine = raw_line[0]
- extra = raw_line[1]
- self._recipe.append((machine.strip(), extra.strip(), cmd.strip()))
+ # We could get a machine here or a include statement
+ if machine == "include":
+ path = cmd.strip()
+ path = os.path.normpath(self.path + "/" + path)
+ path = path + "/recipe"
+ if path in self.circle:
+ self.log.error("Detect import loop!")
+ raise RecipeExeption
+ self.circle.append(path)
+ recipe_to_include = recipe(path, circle=self.circle)
+
+ if machine == "include":
+ self._recipe.extend(recipe_to_include.recipe)
+ else:
+ self._recipe.append((machine.strip(), extra.strip(), cmd.strip()))
i = i + 1
def run_recipe(self):
for line in self.recipe.recipe:
return_value = self.virtual_machines[line[0]].cmd(line[2])
- if not return_value and line[1] == "":
- self.log.error("Failed to execute command '{}' on {}".format(line[2],line[0]))
+ self.log.debug("Return value is: {}".format(return_value))
+ if return_value != "0" and line[1] == "":
+ self.log.error("Failed to execute command '{}' on {}, return code: {}".format(line[2],line[0], return_value))
return False
- elif return_value == True and line[1] == "!":
- self.log.error("Succeded to execute command '{}' on {}".format(line[2],line[0]))
+ elif return_value == "0" and line[1] == "!":
+ self.log.error("Succeded to execute command '{}' on {}, return code: {}".format(line[2],line[0],return_value))
return False
+ else:
+ self.log.debug("Command '{}' on {} returned with: {}".format(line[2],line[0],return_value))
def virtual_environ_stop(self):
for name in self.virtual_environ.machine_names:
projects / nitsi.git / blobdiff