[TIC-CORE] fix name of default recipe for export function

- fix name of default recipe  for export function
- default recipe: recipe.yaml

Change-Id: I2259bc9ad3e4ad646b96ca6f1f3124b788399c7b
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

diff --git a/tic/command.py b/tic/command.py
index 29d2245..7e3598d 100644 (file)
--- a/tic/command.py
+++ b/tic/command.py
@@ -36,13 +36,14 @@ from tic.config import configmgr
 DEFAULT_CACHEDIR=configmgr.setting['tempdir']
 DEFAULT_ANALYSISDIR=os.path.join(DEFAULT_CACHEDIR, 'analysis')
 DEFAULT_KICKSTARTDIR=os.path.join(DEFAULT_CACHEDIR, 'kickstart')
+DEFAULT_RECIPE_NAME='recipe.yaml';
 
 def analyze(recipe_list):
     logger = logging.getLogger(__name__)
     if not recipe_list:
         logger.info('Use default recipe because there is no import data')
         recipe_list = default_recipe.getDefaultParameter()
-    
+
     recipe_parser = RecipeParser(recipe_list)
     recipe_parser.parse()
     recipe_info = recipe_parser.getMergedRecipe()
@@ -109,12 +110,14 @@ def exports(export_type, recipes, packages, outdir, filename=None):
     if not export_type:
         export_type='ks'
         logger.info('set default export format(.ks)')
+    if not filename and export_type == 'recipe':
+        filename = DEFAULT_RECIPE_NAME
 
     if not recipes:
         raise TICError(configmgr.message['recipes_not_define'])
     if not packages or type(packages) is not list:
         raise TICError(configmgr.message['no_package_to_install'])
-    
+
     recipe_parser = RecipeParser(recipes)
     recipe_parser.parse()
     result = None

diff --git a/tic/parser/recipe_parser.py b/tic/parser/recipe_parser.py
index 2a48580..82b9e4c 100644 (file)
--- a/tic/parser/recipe_parser.py
+++ b/tic/parser/recipe_parser.py
@@ -283,8 +283,8 @@ class RecipeParser(object):
             for repo in mergedInfo['Repositories']:
                 mergedInfo['Recipe']['Repos'].append(repo['name'])
         return mergedInfo
-    
-    def export2Recipe(self, packages, outdir, filename='recipe.yaml'):
+
+    def export2Recipe(self, packages, outdir, filename):
         logger = logging.getLogger(__name__)
         recipe = self.getMergedRecipe()
         make_dirs(outdir)

diff --git a/tic/server/tic_server.py b/tic/server/tic_server.py
index 51383ef..76aa2fd 100644 (file)
--- a/tic/server/tic_server.py
+++ b/tic/server/tic_server.py
@@ -16,6 +16,7 @@
 # Contributors:
 # - S-Core Co., Ltd
 
+import traceback
 import collections
 from flask import Flask
 from flask import Response
@@ -52,9 +53,8 @@ def analysis():
         logger.error(ve)
         resp = makeresponse(str(ve), ve)
     except Exception as ex:
-        logger.error(ex)
+        logger.error(traceback.print_exc())
         resp = makeresponse(str(ex), ex)
-    
     return resp
 
 @app.route('/imports', methods=['POST'])
@@ -69,9 +69,8 @@ def imports():
         logger.error(err)
         resp = makeresponse(str(err), err)
     except Exception as ex:
-        logger.error(ex)
+        logger.error(traceback.print_exc())
         resp = makeresponse(str(ex), ex)
-    
     return resp
 
 @app.route('/exports', methods=['POST'])
@@ -90,15 +89,13 @@ def exports():
         logger.error(ve)
         resp = makeresponse(str(ve), ve)
     except Exception as ex:
-        logger.error(ex)
+        logger.error(traceback.print_exc())
         resp = makeresponse(str(ex), ex)
     return resp
 
-
 def start(port_num=8082):
     # cryptographic random generator
-    app.secret_key = os.urandom(24) 
-    
+    app.secret_key = os.urandom(24)
     with app.test_request_context():
         print(url_for('index'))
         print(url_for('analysis'))