From: Linda Wang <wangwulin@huawei.com>
Date: Tue, 12 Sep 2017 03:40:23 +0000 (+0000)
Subject: Fix some errors about getting tiers resources
X-Git-Tag: opnfv-5.0.RC1~84^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=216dfea5112073936f5fc1f686432830651f37e9;p=functest.git

Fix some errors about getting tiers resources

Change-Id: I95cf1cb453e30875498d4dfbbe15f19452c48df1
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---

diff --git a/functest/api/resources/v1/tiers.py b/functest/api/resources/v1/tiers.py
index 4f4849e98..b58ab205e 100644
--- a/functest/api/resources/v1/tiers.py
+++ b/functest/api/resources/v1/tiers.py
@@ -31,7 +31,7 @@ class V1Tiers(ApiResource):
         data = [i.strip() for i in data if i != '']
         data_dict = dict()
         for i in range(len(data) / 2):
-            one_data = {data[i * 2]: data[i * 2 + 1]}
+            one_data = {data[i * 2].lstrip('- ').rstrip(':'): data[i * 2 + 1]}
             if i == 0:
                 data_dict = one_data
             else:
@@ -45,14 +45,15 @@ class V1Tier(ApiResource):
 
     def get(self, tier_name):  # pylint: disable=no-self-use
         """ GET the info of one tier """
-        testcases = Tier().gettests(tier_name)
-        if not testcases:
+        tier_info = Tier().show(tier_name)
+        if not tier_info:
             return api_utils.result_handler(
                 status=1,
                 data="The tier with name '%s' does not exist." % tier_name)
-        tier_info = Tier().show(tier_name)
         tier_info.__dict__.pop('name')
         tier_info.__dict__.pop('tests_array')
+        tier_info.__dict__.pop('skipped_tests_array')
+        testcases = Tier().gettests(tier_name)
         result = {'tier': tier_name, 'testcases': testcases}
         result.update(tier_info.__dict__)
         return jsonify(result)
@@ -63,10 +64,11 @@ class V1TestcasesinTier(ApiResource):
 
     def get(self, tier_name):  # pylint: disable=no-self-use
         """ GET all testcases within given tier """
-        testcases = Tier().gettests(tier_name)
-        if not testcases:
+        tier_info = Tier().show(tier_name)
+        if not tier_info:
             return api_utils.result_handler(
                 status=1,
                 data="The tier with name '%s' does not exist." % tier_name)
+        testcases = Tier().gettests(tier_name)
         result = {'tier': tier_name, 'testcases': testcases}
         return jsonify(result)