Merge "Use lowercase for table names in beans" into dublin

diff --git a/INFO.yaml b/INFO.yaml
index 065bea8..77f51bc 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -50,10 +50,10 @@ committers:
       company: 'Cloudify'
       id: 'dfilppi'
       timezone: ''
-    - name: 'Rob Daugherty'
-      email: 'rd472p@att.com'
+    - name: 'Max Benjamin'
+      email: 'max.benjamin@att.com'
       company: 'ATT'
-      id: 'rd472p'
+      id: 'mfour'
       timezone: ''
     - name: 'Yan Yang'
       email: 'yangyanyj@chinamobile.com'

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/MonitorVnfmCreateNodeStatus.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/MonitorVnfmCreateNodeStatus.bpmn
index 6d54262..e7d40e8 100644 (file)
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/MonitorVnfmCreateNodeStatus.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/MonitorVnfmCreateNodeStatus.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1ko0frn" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
-  <bpmn:process id="Process_1" isExecutable="true">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1ko0frn" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.0.3">
+  <bpmn:process id="MonitorVnfmCreateNodeStatus" name="MonitorVnfmCreateNodeStatus" isExecutable="true">
     <bpmn:startEvent id="StartEvent_0k0qfjb">
       <bpmn:outgoing>SequenceFlow_1miob62</bpmn:outgoing>
     </bpmn:startEvent>
@@ -56,7 +56,7 @@
     <bpmn:sequenceFlow id="SequenceFlow_0qcc5x4" sourceRef="BoundaryEvent_1f5o5i9" targetRef="ServiceTask_12qp0ty" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="MonitorVnfmCreateNodeStatus">
       <bpmndi:BPMNShape id="StartEvent_0k0qfjb_di" bpmnElement="StartEvent_0k0qfjb">
         <dc:Bounds x="155" y="219" width="36" height="36" />
       </bpmndi:BPMNShape>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
index 94e9568..b0ba059 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
@@ -205,14 +205,22 @@ public class VnfAdapterVfModuleObjectMapper {
     private void buildDirectivesParamFromMap(Map<String, Object> paramsMap, String directive,
             Map<String, Object> srcMap) {
         StringBuilder directives = new StringBuilder();
-        if (srcMap.size() > 0) {
+        int no_directives_size = 0;
+        if (directives.equals(MsoMulticloudUtils.USER_DIRECTIVES)
+                && srcMap.containsKey(MsoMulticloudUtils.OOF_DIRECTIVES)) {
+            no_directives_size = 1;
+        }
+        if (srcMap.size() > no_directives_size) {
             directives.append("{ \"attributes\": [ ");
             int i = 0;
             for (String attributeName : srcMap.keySet()) {
-                directives.append(new AttributeNameValue(attributeName, srcMap.get(attributeName).toString()));
-                if (i < (srcMap.size() - 1))
-                    directives.append(", ");
-                i++;
+                if (!(MsoMulticloudUtils.USER_DIRECTIVES.equals(directives)
+                        && attributeName.equals(MsoMulticloudUtils.OOF_DIRECTIVES))) {
+                    directives.append(new AttributeNameValue(attributeName, srcMap.get(attributeName).toString()));
+                    if (i < (srcMap.size() - 1 + no_directives_size))
+                        directives.append(", ");
+                    i++;
+                }
             }
             directives.append("] }");
         } else {

diff --git a/version.properties b/version.properties
index 77e67b1..44e6ad0 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}