10/31: merge casablanca to master

Commit: 649c4e85cc991ffe9c13fd3fab4cc3a303faa656
Subject: Fix Error, Check that vimID is present
Issue: SO-1156
https://gerrit.onap.org/r/#/c/71247/

Commit: 959493d3274d2f2749586248cf31ee12b730e2af
Subject: Bug fixes October 26th
Issue: SO-1169
https://gerrit.onap.org/r/#/c/71343/

Commit: 373c057bfa82583f615ea46814ad3cdf9ea8d669
Subject: Resolve vf_module_id setting bug
Issue: SO-1165
https://gerrit.onap.org/r/#/c/71270/

Commit: 6c2c8a66fade016f74b51bdfea3ba04494530b97
Issue: SO-1102
Subject: Pnf Spring Environment correction
https://gerrit.onap.org/r/#/c/71137/

Change-Id: I22b4566050f627e1f1428aacdb52ec4d4fe75733
Issue-ID: SO-1173
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --cc bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/delegate/CheckAaiForCorrelationIdDelegate.java
Simple merge

diff --cc bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputsTest.java
index 9794a59,2e8fb4b..1f3ecce
--- 1/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputsTest.java
--- 2/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputsTest.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PnfCheckInputsTest.java
@@@ -51,17 -52,8 +52,18 @@@ public class PnfCheckInputsTest 
          assertThatThrownBy(() -> testedObject.execute(delegateExecution)).isInstanceOf(BpmnError.class);
      }
  
 +    @Test
 +    public void shouldThrowException_whenPnfIdIsEmptyString() throws Exception {
 +        // given
 +        PnfCheckInputs testedObject = new PnfCheckInputs(DEFAULT_TIMEOUT);
 +        DelegateExecution delegateExecution = mockDelegateExecution();
 +        when(delegateExecution.getVariable(CORRELATION_ID)).thenReturn("");
 +        // when, then
 +        assertThatThrownBy(() -> testedObject.execute(delegateExecution)).isInstanceOf(BpmnError.class);
 +    }
 +
      private DelegateExecution mockDelegateExecutionWithCorrelationId() {
+         new PnfCheckInputs(DEFAULT_TIMEOUT);
          DelegateExecution delegateExecution = mockDelegateExecution();
          when(delegateExecution.getVariable(CORRELATION_ID)).thenReturn("testCorrelationId");
          return delegateExecution;
@@@ -96,4 -78,4 +98,4 @@@
          // then
          verify(delegateExecution).setVariable(eq(TIMEOUT_FOR_NOTIFICATION), eq(DEFAULT_TIMEOUT));
      }
--}
++}