Merge "Fix hardcoded orchestration-status"

diff --combined bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
index 54d30d6,0b0070f..0eb16a2
--- 1/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
--- 2/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateServiceInstance.groovy
@@@ -1,6 -1,6 +1,6 @@@
  /*-
   * ============LICENSE_START=======================================================
 - * OPENECOMP - MSO
 + * ONAP - SO
   * ================================================================================
   * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
@@@ -248,13 -248,15 +248,15 @@@ public class DoCreateServiceInstance ex
                        if (siParamsXml == null)
                                siParamsXml = ""
                        execution.setVariable("siParamsXml", siParamsXml)
-       
+ 
                        //AAI PUT
-                       String oStatus= "Active"
+                       String oStatus = execution.getVariable("initialStatus") ?: ""
                        if ("TRANSPORT".equalsIgnoreCase(serviceType))
                        {
                                oStatus = "Created"
                        }
+ 
+                       String statusLine = isBlank(oStatus) ? "" : "<orchestration-status>${oStatus}</orchestration-status>"
                                
                        AaiUtil aaiUriUtil = new AaiUtil(this)
                        String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
@@@ -264,7 -266,7 +266,7 @@@
                                        <service-instance-name>${serviceInstanceName}</service-instance-name>
                                        <service-type>${serviceType}</service-type>
                                        <service-role>${serviceRole}</service-role>
-                                       <orchestration-status>${oStatus}</orchestration-status>
+                                       ${statusLine}
                                    <model-invariant-id>${modelInvariantUuid}</model-invariant-id>
                                    <model-version-id>${modelUuid}</model-version-id>
                                        </service-instance>""".trim()