From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Mon, 20 Aug 2018 00:49:11 +0000 (+0000)
Subject: Merge "Dealing with test related stuffs."
X-Git-Tag: 1.2.0~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c33814b49eaad9d9d7468149b5eb1b5c0b3ccccc;hp=-c;p=vfc%2Fgvnfm%2Fvnflcm.git

Merge "Dealing with test related stuffs."
---

c33814b49eaad9d9d7468149b5eb1b5c0b3ccccc
diff --combined lcm/lcm/nf/views/curd_vnf_views.py
index 9b141b3e,5c5f407e..3200e1f1
--- a/lcm/lcm/nf/views/curd_vnf_views.py
+++ b/lcm/lcm/nf/views/curd_vnf_views.py
@@@ -57,7 -57,7 +57,7 @@@ class CreateVnfAndQueryVnfs(APIView)
              return Response(data={'error': 'Failed to get Vnfs'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
  
      @swagger_auto_schema(
 -        request_body=VnfInstanceSerializer(),
 +        request_body=CreateVnfReqSerializer(),
          responses={
              status.HTTP_201_CREATED: VnfInstanceSerializer(),
              status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
@@@ -109,7 -109,7 +109,7 @@@ class DeleteVnfAndQueryVnf(APIView)
              logger.error(e.message)
              return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
          except Exception as e:
-             logger.eror(e.message)
+             logger.error(e.message)
              logger.error(traceback.format_exc())
              return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid},
                              status=status.HTTP_500_INTERNAL_SERVER_ERROR)