From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Fri, 5 Jul 2019 11:54:25 +0000 (+0000)
Subject: admit op_id for Vim/Wim/Sdn create/edit. Compatibility for new NBI versions
X-Git-Tag: v6.0.2rc1~11
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FLCM.git;a=commitdiff_plain;h=2ef21171d3357ffa8e64067c3659085052a72bf4

admit op_id for Vim/Wim/Sdn create/edit. Compatibility for new NBI versions

Change-Id: I0ede3bdc37326bead60a62f7fcb7fb3fc3944ece
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index 0f4c431..ed25820 100644
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -47,6 +47,7 @@ class VimLcm(LcmBase):
 
     async def create(self, vim_content, order_id):
         vim_id = vim_content["_id"]
+        vim_content.pop("op_id", None)
         logging_text = "Task vim_create={} ".format(vim_id)
         self.logger.debug(logging_text + "Enter")
         db_vim = None
@@ -139,6 +140,7 @@ class VimLcm(LcmBase):
 
     async def edit(self, vim_content, order_id):
         vim_id = vim_content["_id"]
+        vim_content.pop("op_id", None)
         logging_text = "Task vim_edit={} ".format(vim_id)
         self.logger.debug(logging_text + "Enter")
         db_vim = None
@@ -331,6 +333,7 @@ class WimLcm(LcmBase):
 
     async def create(self, wim_content, order_id):
         wim_id = wim_content["_id"]
+        wim_content.pop("op_id", None)
         logging_text = "Task wim_create={} ".format(wim_id)
         self.logger.debug(logging_text + "Enter")
         db_wim = None
@@ -408,6 +411,7 @@ class WimLcm(LcmBase):
 
     async def edit(self, wim_content, order_id):
         wim_id = wim_content["_id"]
+        wim_content.pop("op_id", None)
         logging_text = "Task wim_edit={} ".format(wim_id)
         self.logger.debug(logging_text + "Enter")
         db_wim = None
@@ -572,6 +576,7 @@ class SdnLcm(LcmBase):
 
     async def create(self, sdn_content, order_id):
         sdn_id = sdn_content["_id"]
+        sdn_content.pop("op_id", None)
         logging_text = "Task sdn_create={} ".format(sdn_id)
         self.logger.debug(logging_text + "Enter")
         db_sdn = None
@@ -623,6 +628,7 @@ class SdnLcm(LcmBase):
 
     async def edit(self, sdn_content, order_id):
         sdn_id = sdn_content["_id"]
+        sdn_content.pop("op_id", None)
         logging_text = "Task sdn_edit={} ".format(sdn_id)
         self.logger.debug(logging_text + "Enter")
         db_sdn = None