Bump mdsal to 5.0.2

This bumps mdsal to 5.0.2 as part of Magnesium MRI.

Change-Id: I93e10e95b7a241d678829afb732e2adef82c1a24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index ea8353626324ad336acd7e3ff3224f564b633062..b00161f2ecdc65de17ae000810407ae1afe36daa 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index d3ce83f5936bf74a94e1eb8f3fbb9344846ac4d9..b6267d583fd33bbc794fd35a4480feb9f3908b27 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -12,6 +12,7 @@
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>integration-test-standalone</artifactId>
   <version>0.14.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->

diff --git a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/fwaas/rev150712/FirewallRuleAttributesProtocolBuilder.java b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/fwaas/rev150712/FirewallRuleAttributesProtocolBuilder.java
index a4ea41313998b6c5677e505244992542f2152026..d6a0bfcc368488a0eb78bced4306d8198390997b 100644 (file)
--- a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/fwaas/rev150712/FirewallRuleAttributesProtocolBuilder.java
+++ b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/fwaas/rev150712/FirewallRuleAttributesProtocolBuilder.java
@@ -11,6 +11,7 @@ package org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.FwProtocolBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.NeutronUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.FirewallRuleAttributes.Protocol;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
@@ -22,13 +23,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.Fir
  *
  */
 public class FirewallRuleAttributesProtocolBuilder {
-    public static Protocol getDefaultInstance(final java.lang.String defaultValue) {
-        Class<? extends FwProtocolBase> fwProtocol =
-            NeutronUtils.FwProtocolMapper.get(defaultValue);
+    public static Protocol getDefaultInstance(final String defaultValue) {
+        Class<? extends FwProtocolBase> fwProtocol = NeutronUtils.FwProtocolMapper.get(defaultValue);
         if (fwProtocol != null) {
             return new Protocol(fwProtocol);
         }
-        Short protocol = Short.parseShort(defaultValue);
-        return new Protocol(protocol);
+        return new Protocol(Uint8.valueOf(defaultValue));
     }
 }

diff --git a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/secgroups/rev150712/SecurityRuleAttributesProtocolBuilder.java b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/secgroups/rev150712/SecurityRuleAttributesProtocolBuilder.java
index e4079754039e84f979a8846ce721a1f8795a819c..4171d3a278f88a097bc3fc394267195e485ec746 100644 (file)
--- a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/secgroups/rev150712/SecurityRuleAttributesProtocolBuilder.java
+++ b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/secgroups/rev150712/SecurityRuleAttributesProtocolBuilder.java
@@ -10,6 +10,7 @@ package org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev15071
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.NeutronUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes.Protocol;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 
 /**
@@ -23,14 +24,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712
  */
 public class SecurityRuleAttributesProtocolBuilder {
 
-    public static Protocol getDefaultInstance(java.lang.String defaultValue) {
-        Class<? extends ProtocolBase> protocol =
-            NeutronUtils.ProtocolMapper.get(defaultValue);
+    public static Protocol getDefaultInstance(final String defaultValue) {
+        Class<? extends ProtocolBase> protocol = NeutronUtils.ProtocolMapper.get(defaultValue);
         if (protocol != null) {
             return new Protocol(protocol);
         }
-        Short protocolShort = Short.parseShort(defaultValue);
-        return new Protocol(protocolShort);
+        return new Protocol(Uint8.valueOf(defaultValue));
     }
 
 }

diff --git a/parent/pom.xml b/parent/pom.xml
index cfbdc058f84e17ef0a5ae2083a3ca2c6e9a0a129..877ae700c45a4bd984c365044a7faf9d5f01372d 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>4.0.6</version>
+    <version>5.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
index 11d772e8e23069e44297b26073094b761c4a445d..defb1e5d1dbb4a5b0cccc80d342944fbbb435a94 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
@@ -51,7 +51,7 @@ public final class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvp
         fromMdAdminAttributes(bgpvpn, result);
         result.setAutoAggregate(bgpvpn.isAutoAggregate());
         if (bgpvpn.getVni() != null) {
-            result.setVni(bgpvpn.getVni());
+            result.setVni(bgpvpn.getVni().toJava());
         }
         if (bgpvpn.getType() != null) {
             result.setType(BGPVPN_TYPE_MAP.get(bgpvpn.getType()));

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
index e29ad69d3ff3546451b141c8b034f2f2ae32a0cf..9d6e9212b35a2be5388c1cc384193dddd0b979f6 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
@@ -89,16 +89,16 @@ public final class NeutronFirewallRuleInterface
             answer.setFirewallRuleDstIpAddr(rule.getDestinationIpAddr().stringValue());
         }
         if (rule.getSourcePortRangeMin() != null) {
-            answer.setFirewallRuleSrcPortRangeMin(rule.getSourcePortRangeMin());
+            answer.setFirewallRuleSrcPortRangeMin(rule.getSourcePortRangeMin().toJava());
         }
         if (rule.getSourcePortRangeMax() != null) {
-            answer.setFirewallRuleSrcPortRangeMax(rule.getSourcePortRangeMax());
+            answer.setFirewallRuleSrcPortRangeMax(rule.getSourcePortRangeMax().toJava());
         }
         if (rule.getDestinationPortRangeMin() != null) {
-            answer.setFirewallRuleDstPortRangeMin(rule.getDestinationPortRangeMin());
+            answer.setFirewallRuleDstPortRangeMin(rule.getDestinationPortRangeMin().toJava());
         }
         if (rule.getDestinationPortRangeMax() != null) {
-            answer.setFirewallRuleDstPortRangeMax(rule.getDestinationPortRangeMax());
+            answer.setFirewallRuleDstPortRangeMax(rule.getDestinationPortRangeMax().toJava());
         }
         if (rule.getPosition() != null) {
             answer.setFirewallRulePosition(Integer.valueOf(rule.getPosition().intValue()));

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index ff42840de9ab5720c7501b9292081cae9b15058f..53ccc964121d92bbfb11ca12bb5db1f1fb2a884a 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -105,7 +105,7 @@ public final class NeutronLoadBalancerHealthMonitorInterface
             answer.setLoadBalancerHealthMonitorHttpMethod(healthMonitor.getHttpMethod());
         }
         if (healthMonitor.getMaxRetries() != null) {
-            answer.setLoadBalancerHealthMonitorMaxRetries(healthMonitor.getMaxRetries());
+            answer.setLoadBalancerHealthMonitorMaxRetries(healthMonitor.getMaxRetries().toJava());
         }
         if (healthMonitor.getPools() != null) {
             final List<NeutronID> list = new ArrayList<>();

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
index cceb0a79cbbd70dc36416d922f7684baea146567..a329a8388dab11555b9111950099da389832c373 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -240,13 +240,13 @@ public final class NeutronLoadBalancerPoolInterface
             answer.setPoolMemberAddress(member.getAddress().stringValue());
         }
         if (member.getProtocolPort() != null) {
-            answer.setPoolMemberProtoPort(member.getProtocolPort());
+            answer.setPoolMemberProtoPort(member.getProtocolPort().toJava());
         }
         if (member.getSubnetId() != null) {
             answer.setPoolMemberSubnetID(member.getSubnetId().getValue());
         }
         if (member.getWeight() != null) {
-            answer.setPoolMemberWeight(member.getWeight());
+            answer.setPoolMemberWeight(member.getWeight().toJava());
         }
         return answer;
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
index 16ef0ba8056d58a30b6dded6720acb32a1461051..c53f0af13930b8fc1f828e6e302ca9ae1e77a1e1 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
@@ -96,7 +96,7 @@ public final class NeutronNetworkInterface
         }
         final NetworkMtuExtension mtu = network.augmentation(NetworkMtuExtension.class);
         if (mtu != null && mtu.getMtu() != null) {
-            result.setMtu(mtu.getMtu());
+            result.setMtu(mtu.getMtu().toJava());
         }
         result.setSegments(segments);
         return result;

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
index d141abf40c4732acf8ee2a02a8c0fc2f58c9fcf1..4bac653a38875d53c9cb9d30f24c380580c8aa0b 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
@@ -103,8 +103,8 @@ public final class NeutronQosPolicyInterface
             final List<NeutronQosBandwidthLimitRule> bandwidthLimitRules = new ArrayList<>();
             for (final BandwidthLimitRules rule : qosPolicy.getBandwidthLimitRules()) {
                 NeutronQosBandwidthLimitRule opt = new NeutronQosBandwidthLimitRule();
-                opt.setMaxKbps(rule.getMaxKbps());
-                opt.setMaxBurstKbps(rule.getMaxBurstKbps());
+                opt.setMaxKbps(rule.getMaxKbps().toJava());
+                opt.setMaxBurstKbps(rule.getMaxBurstKbps().toJava());
                 opt.setDirection(DirectionMapper.getDirectionString(rule.getDirection()));
                 bandwidthLimitRules.add(opt);
             }
@@ -114,7 +114,7 @@ public final class NeutronQosPolicyInterface
             final List<NeutronQosDscpMarkingRule> dscpMarkingRules = new ArrayList<>();
             for (final DscpmarkingRules rule : qosPolicy.getDscpmarkingRules()) {
                 NeutronQosDscpMarkingRule opt = new NeutronQosDscpMarkingRule();
-                opt.setDscpMark(rule.getDscpMark());
+                opt.setDscpMark(rule.getDscpMark().toJava());
                 dscpMarkingRules.add(opt);
             }
             result.setDscpMarkingRules(dscpMarkingRules);
@@ -125,7 +125,7 @@ public final class NeutronQosPolicyInterface
                 NeutronQosMinimumBandwidthRule opt = new NeutronQosMinimumBandwidthRule();
                 opt.setID(rule.getTenantId().getValue());
                 opt.setTenantID(rule.getTenantId().getValue());
-                opt.setMinKbps(rule.getMinKbps());
+                opt.setMinKbps(rule.getMinKbps().toJava());
                 opt.setDirection(DirectionMapper.getDirectionString(rule.getDirection()));
                 minimumBandwidthRules.add(opt);
             }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
index 4ca827eb1235cf9180d6bd30ca21c6f239f8b03a..67a5c84cf9199fa29737932c37078b37f31f592c 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
@@ -140,16 +140,16 @@ public final class NeutronSFCFlowClassifierInterface
             result.setProtocol(PROTOCOL_MAP.get(mdClassifier.getProtocol()));
         }
         if (mdClassifier.getSourcePortRangeMin() != null) {
-            result.setSourcePortRangeMin(mdClassifier.getSourcePortRangeMin());
+            result.setSourcePortRangeMin(mdClassifier.getSourcePortRangeMin().toJava());
         }
         if (mdClassifier.getSourcePortRangeMax() != null) {
-            result.setSourcePortRangeMax(mdClassifier.getSourcePortRangeMax());
+            result.setSourcePortRangeMax(mdClassifier.getSourcePortRangeMax().toJava());
         }
         if (mdClassifier.getDestinationPortRangeMin() != null) {
-            result.setDestinationPortRangeMin(mdClassifier.getDestinationPortRangeMin());
+            result.setDestinationPortRangeMin(mdClassifier.getDestinationPortRangeMin().toJava());
         }
         if (mdClassifier.getDestinationPortRangeMax() != null) {
-            result.setDestinationPortRangeMax(mdClassifier.getDestinationPortRangeMax());
+            result.setDestinationPortRangeMax(mdClassifier.getDestinationPortRangeMax().toJava());
         }
         if (mdClassifier.getSourceIpPrefix() != null) {
             result.setSourceIpPrefix(mdClassifier.getSourceIpPrefix().stringValue());

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index a60637f597f822464ef38d289b1159d96721ca64..8cc3f361b4b2760adaf51c8d13867c73b5e32d70 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -86,10 +86,10 @@ public final class NeutronSecurityRuleInterface extends
             answer.setSecurityRuleEthertype(ETHERTYPE_MAP.get(rule.getEthertype()));
         }
         if (rule.getPortRangeMin() != null) {
-            answer.setSecurityRulePortMin(rule.getPortRangeMin());
+            answer.setSecurityRulePortMin(rule.getPortRangeMin().toJava());
         }
         if (rule.getPortRangeMax() != null) {
-            answer.setSecurityRulePortMax(rule.getPortRangeMax());
+            answer.setSecurityRulePortMax(rule.getPortRangeMax().toJava());
         }
         return answer;
     }