From: Steve Smokowski <ss835w@att.com>
Date: Sat, 12 Jan 2019 13:13:34 +0000 (+0000)
Subject: Merge "Miscellaneous fixes"
X-Git-Tag: 1.4.1~372
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0d0590405f93472866a910a8f4164781844e9101;p=so.git

Merge "Miscellaneous fixes"
---

0d0590405f93472866a910a8f4164781844e9101
diff --cc bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
index ab260e48f3,0cabcf638f..9fd16340b6
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
@@@ -207,10 -207,10 +207,10 @@@ public class UpdateAAIGenericVnf extend
  			String orchestrationStatusEntry = ""
  			if (orchestrationStatus != null) {
  				// Construct payload
- 				orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')
+ 				orchestrationStatusEntry = updateGenericVnfNode(origRequest, 'orchestration-status')
  			}
  
 -			def payload = """
 +			String payload = """
  					{	${personaModelVersionEntry}
  						${ipv4OamAddressEntry}
  						${managementV6AddressEntry}