Refactor codes for manual scale ns

Change-Id: I6d8b1adaa23a37ca26026320979b5d1ec9f3835e
Issue-ID: VFC-1429
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/ns/tests/test_ns_manual_scale.py b/lcm/ns/tests/test_ns_manual_scale.py
index e4c3c71..4c31611 100644 (file)
--- a/lcm/ns/tests/test_ns_manual_scale.py
+++ b/lcm/ns/tests/test_ns_manual_scale.py
@@ -131,7 +131,7 @@ class TestNsManualScale(TestCase):
         mock_start.side_effect = NSLCMException("NS scale failed.")
         response = self.client.post("/api/nslcm/v1/ns/%s/scale" % self.ns_inst_id, data={}, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertIn("detail", response.data)
+        self.assertIn("error", response.data)
 
     @mock.patch.object(NSManualScaleService, 'start')
     def test_ns_manual_scale_when_ns_not_exist(self, mock_start):
@@ -139,4 +139,4 @@ class TestNsManualScale(TestCase):
         scale_ns_json = SCALE_NS_DICT.copy()
         response = self.client.post("/api/nslcm/v1/ns/11/scale", data=scale_ns_json, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertIn("detail", response.data)
+        self.assertIn("error", response.data)

diff --git a/lcm/ns/views/deprecated/common.py b/lcm/ns/views/deprecated/common.py
index ac1d312..379a948 100644 (file)
--- a/lcm/ns/views/deprecated/common.py
+++ b/lcm/ns/views/deprecated/common.py
@@ -27,8 +27,7 @@ logger = logging.getLogger(__name__)
 def make_error_resp(status, detail):
     return Response(
         data={
-            'status': status,
-            'detail': detail
+            'error': detail
         },
         status=status
     )