Merge "Added to support to enabling l2 multicasting"

5 files changed, 21 insertions, 16 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
index dcf33da128..a00b9f9002 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
@@ -272,6 +272,14 @@ public class HeatBridgeImpl implements HeatBridgeApi {
             } else {
                 lIf.setInterfaceRole(port.getvNicType());
             }
+            boolean isL2Multicast = false;
+            if (port.getProfile().get("trusted") != null) {
+                String trusted = port.getProfile().get("trusted").toString();
+                if (Boolean.parseBoolean(trusted)) {
+                    isL2Multicast = true;
+                }
+            }
+            lIf.setL2Multicasting(isL2Multicast);
             updateLInterfaceIps(port, lIf);
             updateLInterfaceVlan(port, lIf);
 
diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml
index 39555f3f4a..8c7be3eb7e 100644
--- a/graph-inventory/aai-client/pom.xml
+++ b/graph-inventory/aai-client/pom.xml
@@ -72,7 +72,6 @@
                 <artifactItem>
                   <groupId>org.onap.aai.schema-service</groupId>
                   <artifactId>aai-schema</artifactId>
-                  <version>1.6.5</version>
                   <outputDirectory>${project.build.directory}/swagger</outputDirectory>
                   <includes>**/*.yaml</includes>
                 </artifactItem>
@@ -276,7 +275,6 @@
     <dependency>
       <groupId>org.onap.aai.schema-service</groupId>
       <artifactId>aai-schema</artifactId>
-      <version>1.6.5</version>
     </dependency>
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIVersion.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIVersion.java
index 0ddbb8fae5..ef43717b4f 100644
--- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIVersion.java
+++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIVersion.java
@@ -32,7 +32,8 @@ public enum AAIVersion implements GraphInventoryVersion {
     V16("v16"),
     V17("v17"),
     V18("v18"),
-    V19("v19");
+    V19("v19"),
+    V20("v20");
 
     public static final AAIVersion LATEST = AAIVersion.values()[AAIVersion.values().length - 1];
     private final String value;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
index 143c92861a..ef90b22b01 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
@@ -26,6 +26,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -1389,7 +1390,7 @@ public class ServiceInstancesTest extends BaseTest {
     @Test
     public void replaceVfModuleInstanceNoCloudConfigurationTest() throws IOException {
         wireMockServer.stubFor(
-                get(urlPathEqualTo("/aai/v19/network/generic-vnfs/generic-vnf/ff305d54-75b4-431b-adb2-eb6b9e5ff000"))
+                get(urlPathMatching("/aai/v\\d+/network/generic-vnfs/generic-vnf/ff305d54-75b4-431b-adb2-eb6b9e5ff000"))
                         .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
                                 .withBodyFile("infra/Vnf.json").withStatus(org.apache.http.HttpStatus.SC_OK)));
         wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/WorkflowActionBB"))
diff --git a/pom.xml b/pom.xml
index 564e01e086..909c1b9b14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <organization>
     <name>ONAP - SO</name>
     <url>http://www.onap.org/</url>
-  </organization>
+  </organization> 
   <modules>
     <module>deployment-configs</module>
     <module>common</module>
@@ -212,17 +212,9 @@
       </resource>
     </resources>
     <plugins>
-      <!-- <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-          <serverId>ecomp-staging</serverId>
-        </configuration>
-      </plugin> -->
+      <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <version>1.6.7</version> 
+        <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> <stagingProfileId>176c31dfe190a</stagingProfileId> 
+        <serverId>ecomp-staging</serverId> </configuration> </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -915,6 +907,11 @@
         <artifactId>json</artifactId>
         <version>20140107</version>
       </dependency>
+      <dependency>
+        <groupId>org.onap.aai.schema-service</groupId>
+        <artifactId>aai-schema</artifactId>
+        <version>1.7.1-SNAPSHOT</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>