Merge "Modify catalog Schema"
authormaopeng zhang <zhang.maopeng1@zte.com.cn>
Sat, 16 Sep 2017 00:49:06 +0000 (00:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 16 Sep 2017 00:49:06 +0000 (00:49 +0000)
1  2 
catalog/packages/views.py

@@@ -115,13 -110,10 +115,13 @@@ def ns_model_parser(request, *args, **k
      csar_id = ignore_case_get(request.data, "csarId")
      inputs = ignore_case_get(request.data, "inputs")
      if request.method == 'POST':
-         ret = ns_package.parser_nsdmodel(csar_id,inputs)
+         ret = ns_package.parser_NSPackageModel(csar_id,inputs)
          normal_status = status.HTTP_202_ACCEPTED
 +    else:
 +        ret = [1, "Request is not allowed"]
 +        normal_status = ""
  
 -    logger.info("Leave %s, Return value is %s", fun_name(), str(ret))
 +    logger.info("Leave %s, Return value is %s", fun_name(), ret)
      if ret[0] != 0:
          return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
      return Response(data=ret[1], status=normal_status)