From: Benjamin, Max (mb388a) Date: Tue, 25 Jun 2019 19:52:39 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/dublin' into 'origin/master' X-Git-Tag: 1.5.2~243^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F90481%2F1;p=so.git Merge remote-tracking branch 'origin/dublin' into 'origin/master' Change-Id: I2b91332563d9c7b0f469c9e45a35cc1376465c5e Issue-ID: SO-2058 Signed-off-by: Benjamin, Max (mb388a) --- 93bc7a00350d6ed250b26d47d5bd28147c591523 diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 7d5dd95742,94209908be..fffaee0f7c --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@@ -111,8 -115,9 +111,9 @@@ public class WorkflowAction "vnfs|vfModules|networks|networkCollections|volumeGroups|serviceInstances|instanceGroups"; private static final String HOMINGSOLUTION = "Homing_Solution"; private static final String FABRIC_CONFIGURATION = "FabricConfiguration"; - private static final String G_SERVICE_TYPE = "serviceType"; private static final String SERVICE_TYPE_TRANSPORT = "TRANSPORT"; + private static final String SERVICE_TYPE_BONDING = "BONDING"; + private static final String CLOUD_OWNER = "DEFAULT"; private static final Logger logger = LoggerFactory.getLogger(WorkflowAction.class); @Autowired