X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Finstaller%2Fcommon%2Frestore_config.py;h=5cb83b276ae945f38b5a4537f08cef82d0022c47;hb=a6575910a137f8932e294f66c9da3194ad937691;hp=c1f919c17266de784b67dfb1c32057c13ed5f855;hpb=f9e1e3b1ae4be80bc2dc61d9c4213c81c091ea72;p=doctor.git

diff --git a/doctor_tests/installer/common/restore_config.py b/doctor_tests/installer/common/restore_config.py
index c1f919c1..5cb83b27 100644
--- a/doctor_tests/installer/common/restore_config.py
+++ b/doctor_tests/installer/common/restore_config.py
@@ -9,11 +9,15 @@
 import os
 import shutil
 
-ep_file = '/etc/ceilometer/event_pipeline.yaml'
-ep_file_bak = '/etc/ceilometer/event_pipeline.yaml.bak'
+
+cbase = "/var/lib/config-data/puppet-generated/ceilometer"
+if not os.path.isdir(cbase):
+    cbase = ""
 
 
 def restore_ep_config():
+    ep_file = cbase + '/etc/ceilometer/event_pipeline.yaml'
+    ep_file_bak = cbase + '/etc/ceilometer/event_pipeline.yaml.bak'
 
     if not os.path.isfile(ep_file_bak):
         print('Bak_file:%s does not exist.' % ep_file_bak)
@@ -25,31 +29,20 @@ def restore_ep_config():
 
 
 def restore_ed_config():
-
-    ed_file = '/etc/ceilometer/event_definitions.yaml'
-    ed_file_bak = '/etc/ceilometer/event_definitions.bak'
+    ed_file = cbase + '/etc/ceilometer/event_definitions.yaml'
+    ed_file_bak = cbase + '/etc/ceilometer/event_definitions.bak'
 
     if not os.path.isfile(ed_file_bak):
         print("Bak_file doesn't exist: %s." % ed_file_bak)
     else:
         print('restore: %s' % ed_file)
-        shutil.copyfile(ed_file_bak, ed_file)
+        if os.stat(ed_file_bak).st_size == 0:
+            print('Bak_file empty, so removing also: %s' % ed_file)
+            os.remove(ed_file)
+        else:
+            shutil.copyfile(ed_file_bak, ed_file)
         os.remove(ed_file_bak)
     return
 
-
-def restore_cpu_allocation_ratio():
-    nova_file = '/etc/nova/nova.conf'
-    nova_file_bak = '/etc/nova/nova.bak'
-
-    if not os.path.isfile(nova_file_bak):
-        print('Bak_file:%s does not exist.' % nova_file_bak)
-    else:
-        print('restore: %s' % nova_file)
-        shutil.copyfile(nova_file_bak, nova_file)
-        os.remove(nova_file_bak)
-    return
-
 restore_ep_config()
 restore_ed_config()
-restore_cpu_allocation_ratio()