Browse Source

[FIX] method names

Gogs 7 years ago
parent
commit
9c9e13a763
3 changed files with 14 additions and 14 deletions
  1. 10 10
      api/resources/odoo_resource.py
  2. 0 2
      api/utils/docker_api.py
  3. 4 2
      api/utils/odoo_api.py

+ 10 - 10
api/resources/odoo_resource.py

@@ -13,9 +13,9 @@ from api.utils.odoo_api import (
     create_folders,
     create_configuration,
     create_database,
-    copy_database_backup_file,
+    copy_database_seed,
     restore_database,
-    remove_database_backup_file,
+    remove_database_seed,
     create_odoo_container,
     apply_permissions
 )
@@ -111,15 +111,15 @@ class OdooResource(Resource):
             })
 
         # 6. Copy a database backup
-        backup_copied = copy_database_backup_file()
+        seed_copied = copy_database_seed()
 
-        if not backup_copied:
-            r.issue = 'database backup cannot be copied'
+        if not seed_copied:
+            r.issue = 'database seed cannot be copied'
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'database backup cannot be copied'
+                'error_message': 'database seed cannot be copied'
             })
         
         # 7. Restore database schema 
@@ -135,15 +135,15 @@ class OdooResource(Resource):
             })
 
         # 8. Remove unused bakup file
-        backup_removed = remove_database_backup_file()
+        seed_removed = remove_database_seed()
 
-        if not backup_removed:
-            r.issue = 'backup cannot be removed'
+        if not seed_removed:
+            r.issue = 'seed cannot be removed'
             r.status = 5
             r.save()
 
             return self.create_response(request, {
-                'error_message': 'backup cannot be removed'
+                'error_message': 'seed cannot be removed'
             })
 
 

+ 0 - 2
api/utils/docker_api.py

@@ -4,8 +4,6 @@ from django.conf import settings
 from docker import DockerClient
 from docker.errors import DockerException, NotFound, APIError, ContainerError, ImageNotFound
 import time
-import tarfile as tar
-from io import BytesIO
 
 '''
 '''

+ 4 - 2
api/utils/odoo_api.py

@@ -139,7 +139,7 @@ def create_database(name=None):
 
 '''
 '''
-def copy_database_backup_file():
+def copy_database_seed():
     backup_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'files', 'odoo.tar')
     return copy_in(settings.ODOO_DB_CONTAINER, '/tmp', backup_path)
 
@@ -154,7 +154,7 @@ def restore_database(name=None):
 
 '''
 '''
-def remove_database_backup_file():
+def remove_database_seed():
     cmd = 'rm -f %s' % ('/tmp/odoo.sql')
     return execute_command(settings.ODOO_DB_CONTAINER, cmd)
 
@@ -171,5 +171,7 @@ def create_odoo_container(name=None, ports=[]):
     })  , settings.ODOO_DEFAULT_FOLDERS))
 
     run_container(settings.ODOO_IMAGE, name, ports, volumes, settings.DOCKER_NETWORK_NAME)
+    
+    time.sleep(5)
 
     return True