X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fcommon.py;h=a3c87a3c762ff08c02bc7ed407f0bea3c947dfc5;hb=c71175866d16bedda627b47acde2d46f33559127;hp=1f6b6b015de185dcb3cc2957e6932291f871319d;hpb=1306f9c091fadb8cdd5a6b34aef046524872cfda;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/views/common.py b/lcm/lcm/nf/views/common.py
index 1f6b6b01..a3c87a3c 100644
--- a/lcm/lcm/nf/views/common.py
+++ b/lcm/lcm/nf/views/common.py
@@ -14,6 +14,7 @@
 
 import traceback
 import logging
+import uuid
 
 from rest_framework import status
 from rest_framework.response import Response
@@ -27,9 +28,12 @@ from lcm.pub.exceptions import NFLCMExceptionSeeOther
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.nf.const import OPERATION_TYPE
+from lcm.nf.serializers.vnf_instance import VnfInstanceSerializer
 
 logger = logging.getLogger(__name__)
 
+CACHE_ETAG = None
+
 
 def make_error_resp(status, detail):
     return Response(
@@ -49,7 +53,7 @@ def view_safe_call_with_log(logger):
             except NFLCMExceptionSeeOther as e:
                 logger.error(e.message)
                 resp = Response(status=status.HTTP_303_SEE_OTHER)
-                resp["Location"] = ""
+                resp["Location"] = e.message
                 # resp["Location"] = "subscriptions/%s" % e.id
                 return resp
             except NFLCMExceptionNotFound as e:
@@ -94,6 +98,7 @@ def view_safe_call_with_log(logger):
 
 
 def deal_vnf_action(logger, opt_type, opt_status, instid, req, req_serializer, act_task):
+    global CACHE_ETAG
     logger.debug("%s--post::> %s, %s", opt_type, instid, req.data)
 
     act_vnf_req_serializer = req_serializer(data=req.data)
@@ -107,15 +112,40 @@ def deal_vnf_action(logger, opt_type, opt_status, instid, req, req_serializer, a
     if opt_type == OPERATION_TYPE.INSTANTIATE:
         if vnf_insts[0].status == 'INSTANTIATED':
             raise NFLCMExceptionConflict("VNF(%s) is already INSTANTIATED." % instid)
-    else:
+    elif opt_type != OPERATION_TYPE.MODIFY_INFO:
         if vnf_insts[0].status != 'INSTANTIATED':
             raise NFLCMExceptionConflict("VNF(%s) is not INSTANTIATED." % instid)
 
+    req_etag = None
+    if opt_type == OPERATION_TYPE.MODIFY_INFO:
+        req_etag = req.META.get("HTTP_IF_MATCH")
+        logger.debug("req_etag=%s, CACHE_ETAG=%s", req_etag, CACHE_ETAG)
+        if req_etag and req_etag != CACHE_ETAG:
+            raise NFLCMExceptionPreconditionFailed("Etag mismatch")
+
     job_id = JobUtil.create_job('NF', opt_type, instid)
     JobUtil.add_job_status(job_id, 0, "VNF_%s_READY" % opt_type)
 
-    vnf_insts.update(status=opt_status)
+    # vnf_insts.update(status=opt_status)
     act_task(req.data, instid, job_id).start()
 
     resp = Response(data={"jobId": job_id}, status=status.HTTP_202_ACCEPTED)
+    if opt_type == OPERATION_TYPE.MODIFY_INFO:
+        resp["ETag"] = req_etag
+    return resp
+
+
+def deal_indivdual_query(res_serializer, query_fun, *args):
+    global CACHE_ETAG
+
+    res = query_fun(*args)
+    resp_serializer = res_serializer(data=res)
+    if not resp_serializer.is_valid():
+        raise NFLCMException(resp_serializer.errors)
+
+    resp = Response(data=resp_serializer.data, status=status.HTTP_200_OK)
+    if res_serializer == VnfInstanceSerializer:
+        CACHE_ETAG = "%s" % uuid.uuid1()
+        logger.debug("set CACHE_ETAG = %s", CACHE_ETAG)
+        resp["ETag"] = CACHE_ETAG
     return resp