From: Bin Yang <bin.yang@windriver.com>
Date: Mon, 24 Jan 2022 06:15:55 +0000 (+0800)
Subject: Validate nfdeployment descriptor params
X-Git-Tag: 2.0.0-rc1~56
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=98c86a07982d8405aabc7f0e64782d1b91ac4cf4;p=pti%2Fo2.git

Validate nfdeployment descriptor params

Issue-ID: INF-258

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I2af7af0d78d9c4db9d75049ce84436d8b9dc9230
---

diff --git a/o2dms/api/dms_lcm_nfdeploymentdesc.py b/o2dms/api/dms_lcm_nfdeploymentdesc.py
index e5b66ca..8024574 100644
--- a/o2dms/api/dms_lcm_nfdeploymentdesc.py
+++ b/o2dms/api/dms_lcm_nfdeploymentdesc.py
@@ -67,13 +67,19 @@ def lcm_nfdeploymentdesc_create(
 
 def _nfdeploymentdesc_validate(desc: NfDeploymentDesc):
     try:
-        json.loads(
-            desc['inputParams']) if desc['inputParams'] else None
-        json.loads(
-            desc['outputParams']) if desc['outputParams'] else None
+        if desc.inputParams:
+            json.loads(desc.inputParams)
+        if desc.outputParams:
+            json.loads(desc.outputParams)
+        if not desc.deploymentManagerId:
+            raise Exception("Invalid deploymentManager Id")
+        if not desc.artifactRepoUrl:
+            raise Exception("Invalid artifactRepoUrl")
+        if not desc.artifactName:
+            raise Exception("Invalid artifactName")
         return
     except json.decoder.JSONDecodeError as e:
-        logger.debug("NfDeploymentDesc validate error with: %s" % (str(e)))
+        logger.debug("NfDeploymentDesc json error with: %s" % (str(e)))
         raise e
     except Exception as e:
         logger.debug("NfDeploymentDesc validate error with: %s" % (str(e)))