X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fdescriptor_topics.py;h=f28fcbf3424fa3f9c885ef9d25f8dcc18932f85c;hb=90e2c6b2c22748d9b476173c1792addeac3fc604;hp=590380a4b7aa99dac42b868d132754c3d0d43f01;hpb=9cfa8163385df6fca38094a4750f6cab22dbf250;p=osm%2FNBI.git

diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py
index 590380a..f28fcbf 100644
--- a/osm_nbi/descriptor_topics.py
+++ b/osm_nbi/descriptor_topics.py
@@ -268,6 +268,8 @@ class DescriptorTopic(BaseTopic):
         # TODO change to Content-Disposition filename https://tools.ietf.org/html/rfc6266
         file_pkg = None
         error_text = ""
+        fs_rollback = []
+
         try:
             if content_range_text:
                 content_range = (
@@ -296,9 +298,10 @@ class DescriptorTopic(BaseTopic):
             else:
                 self.fs.file_delete(proposed_revision_path, ignore_non_exist=True)
                 self.fs.mkdir(proposed_revision_path)
+                fs_rollback.append(proposed_revision_path)
 
             storage = self.fs.get_params()
-            storage["folder"] = _id
+            storage["folder"] = proposed_revision_path
 
             file_path = (proposed_revision_path, filename)
             if self.fs.file_exists(file_path, "file"):
@@ -464,17 +467,6 @@ class DescriptorTopic(BaseTopic):
                     self.fs.file_delete(proposed_revision_path, ignore_non_exist=True)
                     raise e
 
-            # Copy the revision to the active package name by its original id
-            shutil.rmtree(self.fs.path + current_revision_path, ignore_errors=True)
-            os.rename(self.fs.path + proposed_revision_path, self.fs.path + current_revision_path)
-            self.fs.file_delete(current_revision_path, ignore_non_exist=True)
-            self.fs.mkdir(current_revision_path)
-            self.fs.reverse_sync(from_path=current_revision_path)
-            shutil.rmtree(self.fs.path + _id)
-
-            current_desc["_admin"]["storage"] = storage
-            current_desc["_admin"]["onboardingState"] = "ONBOARDED"
-            current_desc["_admin"]["operationalState"] = "ENABLED"
 
             indata = self._remove_envelop(indata)
 
@@ -482,18 +474,33 @@ class DescriptorTopic(BaseTopic):
             if kwargs:
                 self._update_input_with_kwargs(indata, kwargs)
 
+            current_desc["_admin"]["storage"] = storage
+            current_desc["_admin"]["onboardingState"] = "ONBOARDED"
+            current_desc["_admin"]["operationalState"] = "ENABLED"
+            current_desc["_admin"]["modified"] = time()
+            current_desc["_admin"]["revision"] = revision
+
             deep_update_rfc7396(current_desc, indata)
             current_desc = self.check_conflict_on_edit(
                 session, current_desc, indata, _id=_id
             )
-            current_desc["_admin"]["modified"] = time()
-            current_desc["_admin"]["revision"] = revision
+
+            # Copy the revision to the active package name by its original id
+            shutil.rmtree(self.fs.path + current_revision_path, ignore_errors=True)
+            os.rename(self.fs.path + proposed_revision_path, self.fs.path + current_revision_path)
+            self.fs.file_delete(current_revision_path, ignore_non_exist=True)
+            self.fs.mkdir(current_revision_path)
+            self.fs.reverse_sync(from_path=current_revision_path)
+
+            shutil.rmtree(self.fs.path + _id)
+
             self.db.replace(self.topic, _id, current_desc)
 
             #  Store a copy of the package as a point in time revision
             revision_desc = dict(current_desc)
             revision_desc["_id"] = _id + ":" + str(revision_desc["_admin"]["revision"])
             self.db.create(self.topic + "_revisions", revision_desc)
+            fs_rollback = []
 
             indata["_id"] = _id
             self._send_msg("edited", indata)
@@ -525,6 +532,8 @@ class DescriptorTopic(BaseTopic):
         finally:
             if file_pkg:
                 file_pkg.close()
+            for file in fs_rollback:
+                self.fs.file_delete(file, ignore_non_exist=True)
 
     def get_file(self, session, _id, path=None, accept_header=None):
         """
@@ -1214,7 +1223,14 @@ class VnfdTopic(DescriptorTopic):
         Returns:
             vnfd (dict): VNFD which does not include policies
         """
-        # TODO: Extract the policy related parts from the VNFD
+        for df in vnfd.get("df", {}):
+            for policy in ["scaling-aspect", "healing-aspect"]:
+                if (df.get(policy, {})):
+                    df.pop(policy)
+        for vdu in vnfd.get("vdu", {}):
+            for alarm_policy in ["alarm", "monitoring-parameter"]:
+                if (vdu.get(alarm_policy, {})):
+                    vdu.pop(alarm_policy)
         return vnfd
 
     @staticmethod