From: Fu Jinhua Date: Thu, 4 Apr 2019 01:02:22 +0000 (+0000) Subject: Merge "Fix NS Scale serializers error" X-Git-Tag: 1.3.0~61 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=de69cceed42b17b97aff28b5dbfb02551848cdcc;hp=-c;p=vfc%2Fnfvo%2Flcm.git Merge "Fix NS Scale serializers error" --- de69cceed42b17b97aff28b5dbfb02551848cdcc diff --combined lcm/ns/tests/test_sol_ns_scale_api.py index 9d4ed938,50e7bc4a..d11570a5 --- a/lcm/ns/tests/test_sol_ns_scale_api.py +++ b/lcm/ns/tests/test_sol_ns_scale_api.py @@@ -187,19 -187,17 +187,19 @@@ class TestScaleNsApi(TestCase) def test_ns_scale(self, mock_run): data = { "scaleType": "SCALE_NS", - "scaleNsData": [{ - "scaleNsByStepsData": [{ + "scaleNsData": { + "scaleNsByStepsData": { "aspectId": "1", "numberOfSteps": 1, "scalingDirection": "0" - }] - }] + } + } } response = self.client.post(self.url % self.ns_inst_id, data=data) self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) self.assertIsNotNone(response['Location']) + response = self.client.get(response['Location'], format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) @mock.patch.object(NSManualScaleService, 'start') def test_ns_manual_scale_empty_data(self, mock_start): @@@ -216,13 -214,13 +216,13 @@@ mock_start.side_effect = NSLCMException("NS scale failed.") data = { "scaleType": "SCALE_NS", - "scaleNsData": [{ - "scaleNsByStepsData": [{ + "scaleNsData": { + "scaleNsByStepsData": { "aspectId": "1", "numberOfSteps": 1, "scalingDirection": "0" - }] - }] + } + } } response = self.client.post(self.url % '11', data=data) self.assertEqual(