safety checks for protection rule expiry (#64) (#65)

* safety checks for protection rule expiry * safety checks for protection rule expiry while updating cache
nutanix · Sep 1, 2021 · 5c9395e · 5c9395e
1 parent 8ad8e08
commit 5c9395e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/calm/dsl/cli/protection_policies.py b/calm/dsl/cli/protection_policies.py
@@ -61,14 +61,18 @@ def get_protection_policies(limit, offset, project_name, quiet):
             rule_type = ""
             if rule.get("remote_snapshot_retention_policy", {}):
                 rule_type = "Remote"
-                expiry = rule["remote_snapshot_retention_policy"][
-                    "snapshot_expiry_policy"
-                ]["multiple"]
+                expiry = (
+                    rule["remote_snapshot_retention_policy"]
+                    .get("snapshot_expiry_policy", {})
+                    .get("multiple", "")
+                )
             elif rule.get("local_snapshot_retention_policy", {}):
                 rule_type = "Local"
-                expiry = rule["local_snapshot_retention_policy"][
-                    "snapshot_expiry_policy"
-                ]["multiple"]
+                expiry = (
+                    rule["local_snapshot_retention_policy"]
+                    .get("snapshot_expiry_policy", {})
+                    .get("multiple", "")
+                )
             rule_name = rule["name"]
             rule_uuid = rule["uuid"]
             if not expiry:

diff --git a/calm/dsl/db/table_config.py b/calm/dsl/db/table_config.py
@@ -1539,14 +1539,18 @@ def sync(cls):
                 rule_type = ""
                 if rule.get("remote_snapshot_retention_policy", {}):
                     rule_type = "Remote"
-                    expiry = rule["remote_snapshot_retention_policy"][
-                        "snapshot_expiry_policy"
-                    ]["multiple"]
+                    expiry = (
+                        rule["remote_snapshot_retention_policy"]
+                        .get("snapshot_expiry_policy", {})
+                        .get("multiple", "")
+                    )
                 elif rule.get("local_snapshot_retention_policy", {}):
                     rule_type = "Local"
-                    expiry = rule["local_snapshot_retention_policy"][
-                        "snapshot_expiry_policy"
-                    ]["multiple"]
+                    expiry = (
+                        rule["local_snapshot_retention_policy"]
+                        .get("snapshot_expiry_policy", {})
+                        .get("multiple", "")
+                    )
                 rule_name = rule["name"]
                 rule_uuid = rule["uuid"]
                 cls.create_entry(