Skip cloud regions and fix macro

changed aai create tasks to use env instead of urn prop
write serviceInstanceId from resource when exec is null

Change-Id: I2c0acbeeded2b8a4b0afb0f27d65e24fa48b907b
Issue-ID: SO-1329
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/UrnPropertiesReader.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/UrnPropertiesReader.java
index 750cd241e8..5100085020 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/UrnPropertiesReader.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/UrnPropertiesReader.java
@@ -87,6 +87,20 @@ public class UrnPropertiesReader {
         }
     }
     
+    /**
+     * Return the String array URN property value from the environment object
+     * @param variableName URN property name
+     * @return URN property value
+     */
+
+    public static String[] getVariablesArray(String variableName){
+        if (environment != null) {
+            return environment.getProperty(variableName, String[].class);
+        } else {
+            return null;
+        }
+    }
+    
     public static String getVariable(String variableName, String defaultValue) {
     	return Optional.ofNullable(getVariable(variableName)).orElse(defaultValue); 
     }