X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=3fb24aa594529dd8daafeb2bd05877db0f60a229;hb=2d9f6f537a05514b93dea9fd54a8001a17afcc53;hp=0f4c431198f84758485fb31841b8205500fcacb2;hpb=baa51102b17d0ce70be800b08688198b6127f1c4;p=osm%2FLCM.git

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index 0f4c431..3fb24aa 100644
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -29,7 +29,8 @@ __author__ = "Alfonso Tierno"
 
 class VimLcm(LcmBase):
     # values that are encrypted at vim config because they are passwords
-    vim_config_encrypted = ("admin_password", "nsx_password", "vcenter_password")
+    vim_config_encrypted = {"1.1": ("admin_password", "nsx_password", "vcenter_password"),
+                            "default": ("admin_password", "nsx_password", "vcenter_password", "vrops_password")}
 
     def __init__(self, db, msg, fs, lcm_tasks, ro_config, loop):
         """
@@ -47,6 +48,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
@@ -104,7 +106,9 @@ class VimLcm(LcmBase):
                     del vim_account_RO["config"]["sdn-controller"]
                 if "sdn-port-mapping" in vim_account_RO["config"]:
                     del vim_account_RO["config"]["sdn-port-mapping"]
-                for p in self.vim_config_encrypted:
+                vim_config_encrypted_keys = self.vim_config_encrypted.get(schema_version) or \
+                    self.vim_config_encrypted.get("default")
+                for p in vim_config_encrypted_keys:
                     if vim_account_RO["config"].get(p):
                         vim_account_RO["config"][p] = self.db.decrypt(vim_account_RO["config"][p],
                                                                       schema_version=schema_version,
@@ -139,6 +143,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
@@ -221,7 +226,9 @@ class VimLcm(LcmBase):
                 if "config" in vim_content:
                     vim_account_RO["config"] = vim_content["config"]
                 if vim_content.get("config"):
-                    for p in self.vim_config_encrypted:
+                    vim_config_encrypted_keys = self.vim_config_encrypted.get(schema_version) or \
+                        self.vim_config_encrypted.get("default")
+                    for p in vim_config_encrypted_keys:
                         if vim_content["config"].get(p):
                             vim_account_RO["config"][p] = self.db.decrypt(vim_content["config"][p],
                                                                           schema_version=schema_version,
@@ -331,6 +338,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 +416,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 +581,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 +633,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