Bump Version odlparent->6.0.0,mdsal->5.0.3

Change-Id: Ib22096332818b7404d40721732e2a5d9d622a618 Signed-off-by: xcheara <[email protected]> Signed-off-by: Robert Varga <[email protected]>
opendaylight · Oct 15, 2019 · b1314aa · b1314aa
1 parent fa057a9
commit b1314aa
Show file tree

Hide file tree

Showing 94 changed files with 390 additions and 371 deletions.
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>5.0.2</version>
+      <version>6.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/features/features4-sfc/pom.xml b/features/features4-sfc/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-genius/pom.xml b/features/odl-sfc-genius/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-ios-xe-renderer/pom.xml b/features/odl-sfc-ios-xe-renderer/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-model/pom.xml b/features/odl-sfc-model/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/odl-sfc-netconf/pom.xml b/features/odl-sfc-netconf/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-openflow-renderer/pom.xml b/features/odl-sfc-openflow-renderer/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-ovs/pom.xml b/features/odl-sfc-ovs/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-pot-netconf-renderer/pom.xml b/features/odl-sfc-pot-netconf-renderer/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-pot/pom.xml b/features/odl-sfc-pot/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-provider-rest/pom.xml b/features/odl-sfc-provider-rest/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-provider/pom.xml b/features/odl-sfc-provider/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-sb-rest/pom.xml b/features/odl-sfc-sb-rest/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-jackson-2.9</artifactId>
-            <version>5.0.2</version>
+            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-sfc-sb-rest/src/main/feature/feature.xml b/features/odl-sfc-sb-rest/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-sfc-sb-rest">
     <feature name="odl-sfc-sb-rest">
-        <feature version="[5,6)">odl-jackson-2.9</feature>
+        <feature version="[6,7)">odl-jackson-2.9</feature>
     </feature>
 </features>
diff --git a/features/odl-sfc-scf-openflow/pom.xml b/features/odl-sfc-scf-openflow/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-scf-vpp/pom.xml b/features/odl-sfc-scf-vpp/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-shell/pom.xml b/features/odl-sfc-shell/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-sfc-statistics/pom.xml b/features/odl-sfc-statistics/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-vnfm-tacker/pom.xml b/features/odl-sfc-vnfm-tacker/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfc-vpp-renderer/pom.xml b/features/odl-sfc-vpp-renderer/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-sfclisp/pom.xml b/features/odl-sfclisp/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.3</version>
     <relativePath/>
   </parent>
 
@@ -106,7 +106,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/sfc-classifiers/sfc-scf-openflow/pom.xml b/sfc-classifiers/sfc-scf-openflow/pom.xml
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/.../main/java/org/opendaylight/sfc/scfofrenderer/listeners/ClassifierRspsUpdateListener.java b/.../main/java/org/opendaylight/sfc/scfofrenderer/listeners/ClassifierRspsUpdateListener.java
@@ -87,7 +87,7 @@ public void update(@NonNull InstanceIdentifier<RenderedServicePath> instanceIden
             // keep in mind that the only flows in the openflow are classifier
             // flows - the RSP flows are in another
             // of writer instance
-            openflowWriter.deleteRspFlows(originalRenderedServicePath.getPathId());
+            openflowWriter.deleteRspFlows(originalRenderedServicePath.getPathId().toJava());
             openflowWriter.deleteFlowSet();
             List<Acl> theAcls = updateDataGetter.filterAclsByRspName(theRspName);
 

diff --git a/...s/sfc-scf-openflow/src/main/java/org/opendaylight/sfc/scfofrenderer/utils/SfcRspInfo.java b/...s/sfc-scf-openflow/src/main/java/org/opendaylight/sfc/scfofrenderer/utils/SfcRspInfo.java
@@ -182,8 +182,8 @@ public static SfcRspInfo getSfcRspInfo(RenderedServicePath theRsp) {
             return null;
         }
 
-        SfcRspInfo sfcRspInfo = new SfcRspInfo().setRsp(theRsp).setNshNsp(theRsp.getPathId())
-                .setNshStartNsi(theRsp.getStartingIndex())
+        SfcRspInfo sfcRspInfo = new SfcRspInfo().setRsp(theRsp).setNshNsp(theRsp.getPathId().toJava())
+                .setNshStartNsi(theRsp.getStartingIndex().toJava())
                 .setNshEndNsi((short) (lastRspHop.getServiceIndex().intValue() - 1))
                 .setFirstSffName(theFirstHop.getServiceFunctionForwarder())
                 .setLastSffName(lastRspHop.getServiceFunctionForwarder())
@@ -205,10 +205,10 @@ public static SfcRspInfo getSfcRspInfo(RenderedServicePath theRsp) {
             return sfcRspInfo;
         }
 
-        sfcRspInfo.setNshMetaC1(md.getContextHeader1())
-                .setNshMetaC2(md.getContextHeader2())
-                .setNshMetaC3(md.getContextHeader3())
-                .setNshMetaC4(md.getContextHeader4());
+        sfcRspInfo.setNshMetaC1(md.getContextHeader1().toJava())
+                .setNshMetaC2(md.getContextHeader2().toJava())
+                .setNshMetaC3(md.getContextHeader3().toJava())
+                .setNshMetaC4(md.getContextHeader4().toJava());
 
         return sfcRspInfo;
     }

diff --git a/.../sfc-scf-openflow/src/main/java/org/opendaylight/sfc/scfofrenderer/utils/SfcScfMatch.java b/.../sfc-scf-openflow/src/main/java/org/opendaylight/sfc/scfofrenderer/utils/SfcScfMatch.java
@@ -74,28 +74,28 @@ public SfcScfMatch setAclMatch(Matches matches) {
             AceIp aceip = (AceIp) matches.getAceType();
 
             if (aceip.getDscp() != null) {
-                SfcOpenflowUtils.addMatchDscp(mb, aceip.getDscp().getValue());
+                SfcOpenflowUtils.addMatchDscp(mb, aceip.getDscp().getValue().toJava());
             }
 
             if (aceip.getProtocol() != null) {
-                SfcOpenflowUtils.addMatchIpProtocol(mb, aceip.getProtocol());
+                SfcOpenflowUtils.addMatchIpProtocol(mb, aceip.getProtocol().toJava());
 
                 Integer srcPort = null;
                 Integer dstPort = null;
 
                 if (aceip.getSourcePortRange() != null && aceip.getSourcePortRange().getLowerPort() != null
                         && aceip.getSourcePortRange().getLowerPort().getValue() != null
-                        && aceip.getSourcePortRange().getLowerPort().getValue() != 0) {
-                    srcPort = aceip.getSourcePortRange().getLowerPort().getValue();
+                        && aceip.getSourcePortRange().getLowerPort().getValue().toJava() != 0) {
+                    srcPort = aceip.getSourcePortRange().getLowerPort().getValue().toJava();
                 }
                 if (aceip.getDestinationPortRange() != null && aceip.getDestinationPortRange().getLowerPort() != null
                         && aceip.getDestinationPortRange().getLowerPort().getValue() != null
-                        && aceip.getDestinationPortRange().getLowerPort().getValue() != 0) {
-                    dstPort = aceip.getDestinationPortRange().getLowerPort().getValue();
+                        && aceip.getDestinationPortRange().getLowerPort().getValue().toJava() != 0) {
+                    dstPort = aceip.getDestinationPortRange().getLowerPort().getValue().toJava();
                 }
 
                 // don't support port range
-                switch (aceip.getProtocol()) {
+                switch (aceip.getProtocol().toJava()) {
                     case SfcOpenflowUtils.IP_PROTOCOL_UDP:
                         if (srcPort != null) {
                             SfcOpenflowUtils.addMatchSrcUdpPort(mb, srcPort);

diff --git a/...va/org/opendaylight/sfc/scfofrenderer/flowgenerators/LogicallyAttachedClassifierTest.java b/...va/org/opendaylight/sfc/scfofrenderer/flowgenerators/LogicallyAttachedClassifierTest.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.sfc.scfofrenderer.flowgenerators;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -47,6 +47,7 @@
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.GoToTableCase;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -101,7 +102,7 @@ public void setUp() {
         // mock the first SF in the RSP
         String sfName = "SF#1";
         sf = mock(ServiceFunction.class);
-        List<SfDataPlaneLocator> theSfDpls = new ArrayList<SfDataPlaneLocator>() {
+        List<SfDataPlaneLocator> theSfDpls = new ArrayList<>() {
             {
                 LocatorType theLocatorType = new LogicalInterfaceBuilder().setInterfaceName(firstSfNeutronPort).build();
                 add(new SfDataPlaneLocatorBuilder().setLocatorType(theLocatorType).build());
@@ -165,7 +166,7 @@ public void outFlowPositiveCoLocated() {
         Assert.assertEquals(8, ((ApplyActionsCase) flow.getInstructions().getInstruction().get(0).getInstruction())
                 .getApplyActions().getAction().size());
 
-        Assert.assertEquals(new Short("83"),
+        Assert.assertEquals(Uint8.valueOf(83),
                 ((GoToTableCase) flow.getInstructions().getInstruction().get(1).getInstruction()).getGoToTable()
                         .getTableId());
     }