summaryrefslogtreecommitdiffstats
path: root/doctor_tests/installer/mcp.py
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2020-02-10 12:22:31 +0200
committerTomi Juvonen <tomi.juvonen@nokia.com>2020-03-11 08:32:49 +0000
commit6ff11513a0d3728c79033af623c79dd6df7c621e (patch)
tree13cddc5776dc82648c771f4b2bf12ac8cdebd56c /doctor_tests/installer/mcp.py
parent34b4083b4d2d579f6dbd334df06fe9394453680a (diff)
VNFM against Fenix API schema validation fix
-Small API changes as Fenix validates API schema -Bug fixes in building Fenix service and container -Need to wait container ready before testing Related: https://review.opendev.org/#/c/706775/ Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com> Change-Id: I8b88865d6b8569c6660513974955f7cd65619a33
Diffstat (limited to 'doctor_tests/installer/mcp.py')
-rw-r--r--doctor_tests/installer/mcp.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/doctor_tests/installer/mcp.py b/doctor_tests/installer/mcp.py
index f8f33c8..7659c9e 100644
--- a/doctor_tests/installer/mcp.py
+++ b/doctor_tests/installer/mcp.py
@@ -129,8 +129,8 @@ class McpInstaller(BaseInstaller):
def set_apply_patches(self):
self.log.info('Set apply patches start......')
fenix_files = None
-
set_scripts = [self.cm_set_script]
+ thrs = []
restart_cmd = 'sudo systemctl restart' \
' ceilometer-agent-notification.service'
@@ -152,10 +152,10 @@ class McpInstaller(BaseInstaller):
'admin_tool/fenix',
fenix_file)
client.scp(src_file, fenix_file)
- self._run_apply_patches(client,
- restart_cmd,
- set_scripts,
- python=self.python)
+ thrs.append(self._run_apply_patches(client,
+ restart_cmd,
+ set_scripts,
+ python=self.python))
time.sleep(5)
self.log.info('Set apply patches start......')
@@ -165,11 +165,15 @@ class McpInstaller(BaseInstaller):
for node_ip in self.computes:
client = SSHClient(node_ip, self.node_user_name,
key_filename=self.key_file)
- self._run_apply_patches(client,
- restart_cmd,
- [self.nc_set_compute_script],
- python=self.python)
+ thrs.append(self._run_apply_patches(
+ client,
+ restart_cmd,
+ [self.nc_set_compute_script],
+ python=self.python))
time.sleep(5)
+ # If Fenix container ir build, it needs to be ready before continue
+ for thr in thrs:
+ thr.join()
def restore_apply_patches(self):
self.log.info('restore apply patches start......')