From a40e20c5b1fdc8ea38454279c7e00894075af46f Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Fri, 18 May 2018 14:55:19 +0200
Subject: Fix op policy

Fix op policy so that when UI sends empty string the targetResourceId is
set to null

Issue-ID: CLAMP-153
Change-Id: I0b6680106548111d59f2170f8f7c42414e0644c8
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
 .../policy/modelBpmnProperties.json                | 30 ++++++++++++++++------
 .../operational-policy/yaml-policy-chain-1.yaml    |  2 +-
 .../operational-policy/yaml-policy-chain-2.yaml    |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/test/resources')

diff --git a/src/test/resources/example/model-properties/policy/modelBpmnProperties.json b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
index 5c2214e84..0ef387529 100644
--- a/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
@@ -100,7 +100,14 @@
                             "name": "targetResourceId",
                             "value":
                             [
-                                "resource-id"
+                                ""
+                            ]
+                        },
+                        {
+                            "name": "targetResourceIdOther",
+                            "value":
+                            [
+                                ""
                             ]
                         }
                     ],
@@ -162,6 +169,13 @@
                             [
                                 "resource-id"
                             ]
+                        },
+                        {
+                            "name": "targetResourceIdOther",
+                            "value":
+                            [
+                                "resource-idOther"
+                            ]
                         }
                     ]
                 ]
@@ -227,13 +241,6 @@
                             [
                                 ""
                             ]
-                        },
-                        {
-                            "name": "targetResourceId",
-                            "value":
-                            [
-                                "resource-id"
-                            ]
                         }
                     ],
 
@@ -294,6 +301,13 @@
                             [
                                 "resource-id"
                             ]
+                        },
+                        {
+                            "name": "targetResourceIdOther",
+                            "value":
+                            [
+                                "resource-idOther"
+                            ]
                         }
                     ]
                 ]
diff --git a/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml b/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
index fec0e1e6c..3d0252a00 100644
--- a/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
+++ b/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
@@ -31,7 +31,7 @@ policies:
   retry: 3
   success: <generatedId>
   target:
-    resourceID: resource-id
+    resourceID: null
     type: VM
   timeout: 180
 - actor: APPC
diff --git a/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml b/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
index fec0e1e6c..3d0252a00 100644
--- a/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
+++ b/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
@@ -31,7 +31,7 @@ policies:
   retry: 3
   success: <generatedId>
   target:
-    resourceID: resource-id
+    resourceID: null
     type: VM
   timeout: 180
 - actor: APPC
-- 
cgit 1.2.3-korg