8/23: merge casablanca to master

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

diff --combined bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
index 9f6d276,46b46f8..911aabd
--- 1/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
--- 2/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
@@@ -4,7 -4,6 +4,7 @@@ aai
      timeout: '30000'
    endpoint: http://localhost:8443
    workflowAaiDistributionDelay: PT30S
 +  pnfEntryNotificationTimeout: P14D
  camunda:
    bpm:
      admin-user:
@@@ -16,16 -15,7 +16,16 @@@
        core-pool-size: 3
  entitymanager:
    packagesToScan: com
 -
 +pnf:
 +  dmaap:
 +    host: message-router
 +    port: 3904
 +    protocol: http
 +    uriPathPrefix: events
 +    topicName: pnfReady
 +    consumerGroup: consumerGroup
 +    consumerId: consumerId
 +    topicListenerDelayInSeconds: 5
  mso:
    correlation:
      timeout: 60
@@@ -137,7 -127,7 +137,7 @@@
            route-table-reference:
              uri: /aai/v11/network/route-table-references/route-table-reference
            tenant:
-             uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+             uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/AAIAIC25/tenants/tenant
            vce:
              uri: /aai/v11/network/vces/vce
            vpn-binding:
@@@ -158,14 -148,14 +158,14 @@@
            route-table-reference:
              uri: /aai/v8/network/route-table-references/route-table-reference
            tenant:
-             uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+             uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/AAIAIC25/tenants/tenant
            vce:
              uri: /aai/v8/network/vces/vce
            vpn-binding:
              uri: /aai/v8/network/vpn-bindings/vpn-binding
          v9:
            cloud-region:
-             uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
+             uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
            generic-vnf:
              uri: /aai/v9/network/generic-vnfs/generic-vnf
        retry:

diff --combined common/pom.xml
index c5bb44f,4427b37..735b132
--- 1/common/pom.xml
--- 2/common/pom.xml
+++ b/common/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
          <groupId>org.onap.so</groupId>
          <artifactId>so</artifactId>
 -        <version>1.3.0-SNAPSHOT</version>
 +        <version>1.4.0-SNAPSHOT</version>
        </parent>
        <artifactId>common</artifactId>
        <name>MSO Common classes</name>
@@@ -139,6 -139,11 +139,11 @@@
                        <artifactId>logging-slf4j</artifactId>
                        <version>1.2.2</version>
                </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <scope>test</scope>
+               </dependency>
      </dependencies>
        <build>
                <resources>
@@@ -152,6 -157,36 +157,36 @@@
                                        <include>**/*.java</include>
                                </includes>
                        </resource>
-               </resources>            
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>default-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/NonSpringSuite.java</include>
+                                                       </includes>     
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>spring-tests</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includes>
+                                                               <include>**/SpringSuite.java</include>
+                                                       </includes>     
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>      
        </build>
  </project>