From 07b7d00688282affba8df8014924519421374517 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 28 May 2020 07:40:02 -0700 Subject: Add helper method to get simulator instance data Superfluous call to 'get_pnfsim_ip' function in simulator.sh was also removed. Change-Id: Ifd7be4843fe26768f4b86b64e07d2d9479735ad1 Issue-ID: INT-1606 Signed-off-by: Bartek Grzybowski --- test/mocks/mass-pnf-sim/MassPnfSim.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'test/mocks/mass-pnf-sim/MassPnfSim.py') diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py index d15b69551..b69e0fcac 100755 --- a/test/mocks/mass-pnf-sim/MassPnfSim.py +++ b/test/mocks/mass-pnf-sim/MassPnfSim.py @@ -7,6 +7,7 @@ from sys import exit from os import chdir, getcwd, path from shutil import copytree, rmtree from json import dumps +from yaml import load, SafeLoader from glob import glob from requests import get from requests.exceptions import MissingSchema, InvalidSchema, InvalidURL, ConnectionError, ConnectTimeout @@ -104,6 +105,7 @@ class MassPnfSim: return action_decorator log_lvl = logging.INFO + sim_config = 'config/config.yml' def __init__(self, args): self.args = args @@ -150,6 +152,15 @@ class MassPnfSim: '''Helper method that returns bootstraped simulator instances count''' return len(glob(f"{self.sim_dirname_pattern}[0-9]*")) + def _get_sim_instance_data(self, instance_id): + '''Helper method that returns specific instance data''' + oldpwd = getcwd() + chdir(f"{self.sim_dirname_pattern}{instance_id}") + with open(self.sim_config) as cfg: + yml = load(cfg, Loader=SafeLoader) + chdir(oldpwd) + return yml['ippnfsim'] + def bootstrap(self): self.logger.info("Bootstrapping PNF instances") -- cgit 1.2.3-korg