Allow ID to be optional in certain cases

Change-Id: Ia03bdc5bc79b6a2061b6d5381c9ad3273f388aac

diff --git a/moonv4/moon_manager/moon_manager/api/models.py b/moonv4/moon_manager/moon_manager/api/models.py
index 6cb8143..56695c1 100644 (file)
--- a/moonv4/moon_manager/moon_manager/api/models.py
+++ b/moonv4/moon_manager/moon_manager/api/models.py
@@ -18,7 +18,7 @@ class Models(object):
 
     def get_models(self, ctx, args):
         try:
-            data = self.manager.get_models(user_id=ctx["user_id"], model_id=ctx["id"])
+            data = self.manager.get_models(user_id=ctx["user_id"], model_id=ctx.get("id"))
         except Exception as e:
             LOG.error(e, exc_info=True)
             return {"result": False,
@@ -28,7 +28,7 @@ class Models(object):
 
     def add_model(self, ctx, args):
         try:
-            data = self.manager.add_model(user_id=ctx["user_id"], model_id=ctx["id"], value=args)
+            data = self.manager.add_model(user_id=ctx["user_id"], model_id=ctx.get("id"), value=args)
         except Exception as e:
             LOG.error(e, exc_info=True)
             return {"result": False,

diff --git a/moonv4/moon_manager/moon_manager/api/policies.py b/moonv4/moon_manager/moon_manager/api/policies.py
index 8b24247..88c762a 100644 (file)
--- a/moonv4/moon_manager/moon_manager/api/policies.py
+++ b/moonv4/moon_manager/moon_manager/api/policies.py
@@ -18,7 +18,7 @@ class Policies(object):
 
     def get_policies(self, ctx, args):
         try:
-            data = self.manager.get_policies(user_id=ctx["user_id"], policy_id=ctx["id"])
+            data = self.manager.get_policies(user_id=ctx["user_id"], policy_id=ctx.get("id"))
         except Exception as e:
             LOG.error(e, exc_info=True)
             return {"result": False,
@@ -28,7 +28,7 @@ class Policies(object):
 
     def add_policy(self, ctx, args):
         try:
-            data = self.manager.add_policy(user_id=ctx["user_id"], policy_id=ctx["id"], value=args)
+            data = self.manager.add_policy(user_id=ctx["user_id"], policy_id=ctx.get("id"), value=args)
         except Exception as e:
             LOG.error(e, exc_info=True)
             return {"result": False,