Validate nfdeployment descriptor params 03/7603/1
authorBin Yang <bin.yang@windriver.com>
Mon, 24 Jan 2022 06:15:55 +0000 (14:15 +0800)
committerBin Yang <bin.yang@windriver.com>
Mon, 24 Jan 2022 06:52:04 +0000 (14:52 +0800)
Issue-ID: INF-258

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

o2dms/api/dms_lcm_nfdeploymentdesc.py

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