Merge "create new objects not list classes in NeutronNorthboundRSApplication"
authorMichael Vorburger <vorburger@redhat.com>
Tue, 27 Feb 2018 10:48:08 +0000 (10:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 27 Feb 2018 10:48:08 +0000 (10:48 +0000)
142 files changed:
.gitignore
artifacts/pom.xml
features/production/features-neutron/pom.xml
features/production/odl-neutron-hostconfig-ovs/pom.xml
features/production/odl-neutron-hostconfig-vpp/pom.xml
features/production/odl-neutron-logger/pom.xml
features/production/odl-neutron-northbound-api/pom.xml
features/production/odl-neutron-service/pom.xml
features/production/odl-neutron-spi/pom.xml
features/production/odl-neutron-transcriber/pom.xml
features/production/pom.xml
features/test/features-neutron-test/pom.xml
features/test/odl-neutron-logger-test/pom.xml
features/test/pom.xml
integration/test/pom.xml
integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
karaf/pom.xml
model/pom.xml
neutron-hostconfig/ovs/pom.xml
neutron-hostconfig/pom.xml
neutron-hostconfig/utils/pom.xml
neutron-hostconfig/vpp/pom.xml
neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java
neutron-logger/pom.xml
neutron-spi/pom.xml
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronAdminAttributes.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronBaseAttributes.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronBgpvpnCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIpCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronL2gatewayCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronL2gatewayConnectionCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelRuleCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronQosPolicyCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSFCFlowClassifierCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSFCPortChainCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSFCPortPairCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSFCPortPairGroupCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronTapFlowCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronTapServiceCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronTrunkCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVpnIkePolicyCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVpnIpSecPolicyCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVpnIpSecSiteConnectionsCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVpnServiceCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronAdminAttributes.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBaseAttributes.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIp.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosMinimumBandwidthRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapFlow.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapService.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTrunk.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnection.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnService.java
northbound-api/pom.xml
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRuleRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifierRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunkRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePolicyRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPolicyRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnServiceRequest.java
northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
northbound-api/src/main/resources/WEB-INF/web.xml
parent/pom.xml
pom.xml
transcriber/pom.xml
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayConnectionInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java

index a2903aeafcbac73855fb19e740db9ac4c945d5be..6740902df704ab84a7e8be5bb1444d2c88f22e3c 100644 (file)
@@ -28,3 +28,5 @@ yang-gen-config
 yang-gen-sal
 maven-metadata-local.xml
 .factorypath
+.fbExcludeFilterFile
+
index 4237c175a2e5a6265c5514aaadbe84da24eecbef..f05c641eab8e6a9ef0e3590addfaa392efd3e57d 100644 (file)
@@ -13,7 +13,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>neutron-artifacts</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Neutron Artifacts</name>
 
index d7dc491ec761089318de59ad0a5f6dec96b6d71d..0586a2322ab6c77332d9d75c7cc4f8ee151a8e43 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>features-neutron-service</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <dependencies>
index 5127e6e9c4fa6bbc5a88e3076503c3df7599a0ff..a77dc1413a8cbd0043f58b2080370776a8af6479 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-hostconfig-ovs</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Hostconfig :: OVS</name>
 
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.ovsdb</groupId>
                 <artifactId>southbound-artifacts</artifactId>
-                <version>1.6.0-SNAPSHOT</version>
+                <version>1.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <artifactId>odl-ovsdb-utils</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <version>1.6.0-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-cert</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>0.8.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
index 1a56a82fce142a3665e746d34062b246d3b1333b..7fb1901a78e042b7d57b77613c390735dd5a80d2 100644 (file)
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-hostconfig-vpp</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Hostconfig :: VPP</name>
 
     <properties>
-        <netconf.version>1.4.0-SNAPSHOT</netconf.version>
+        <netconf.version>1.5.0-SNAPSHOT</netconf.version>
         <explicitFeatureDependencies>true</explicitFeatureDependencies>
     </properties>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index a42c0b7e697f7ba190a9b257b23015d80fdf66d3..3f3054749f1fa88049b89d2888b32cde8642ffdc 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-logger</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Logger</name>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 8614ffa122cb183a655e216def2fadae609681a2..683b811f2f9b7f0b1b4764a7e71c9edaa6903824 100644 (file)
@@ -13,7 +13,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-northbound-api</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Northbound</name>
 
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-shiro</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>0.8.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 9ca1ae64f770d40c85cf8c19cdfb043905000130..e17a3482342ebae6a075483d6748d393bb425e70 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-service</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Service</name>
 
index 0ff695f8d4452ce5dc34b0e8cae40616d2229f17..2f5222a2270715175fc8efa9f690e70c97101f1b 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-spi</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: API</name>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.12.0-SNAPSHOT</version>
+                <version>0.13.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index fab42be078a4408f84dda2ea46c27f42fff7f99a..6364a65d2e65859061482aa13a865aef1eb877ed 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-transcriber</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Implementation</name>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 6a4bd0c33bc002fc5a8d5af97264c8e2439ad6a0..c98f9a6ff3e604bb737d34ef01d3be3a8c66e838 100644 (file)
@@ -10,7 +10,7 @@
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
index ad9a786a87a41570bb74d06a54c8765f20d09cc2..f41b5636b844fbf5d3309924dcc8982edc922c64 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>features-neutron-test</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <properties>
index 9e39159d3a76fa5fc2261e06d9b36fcc58688d75..34d918da1f831186ff44adece6393c4fa5feda6d 100644 (file)
@@ -14,7 +14,7 @@
 
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>odl-neutron-logger-test</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Neutron :: Logger :: Test</name>
 
index 0698dd668173cca644366e7a696288f29682e1c8..20d919a2bc9c35df34bb0e5e0366ce04dda2ea1d 100644 (file)
@@ -10,7 +10,7 @@
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>features-test-aggregator</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
index 075468407779746d64772200963b576675d5532f..d4fa63f0b213e6f68f72493af860273e32cc85ff 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>integration-test</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
 
   <!-- <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. -->
index 166b01664aed5ef89a5dca649b50b0e339e7a8e8..9097f3cd4b200de1d2f2e8d2776ed7ebb54089e5 100644 (file)
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
 import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
@@ -78,6 +79,8 @@ public class ITNeutronE2E  extends AbstractMdsalTestBase {
 
     private Option[] getOtherOptions() {
         return new Option[] {
+            // timeout 15 minutes instead of default 3 minutes, because Jenkins build VMs are *SLOW*
+            CoreOptions.systemTimeout(15 * 60 * 1000),
             vmOption("-javaagent:../../pax/jars/org.jacoco.agent.jar=destfile=../../jacoco-it.exec"),
             keepRuntimeFolder(), configureConsole().ignoreLocalConsole(),
             logLevel(LogLevel.INFO),
index 337067449d45669d4733aca34c5616fad68d0912..3236fb21a5abb7703b23801347f7063141348a75 100644 (file)
@@ -17,7 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>neutron-karaf</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
 
     <dependencyManagement>
index 528d5d59d4902919365a34ecd1ef9ba040c33289..e89ab7b33d5e7a17e05edb507c45b482c72983a5 100644 (file)
@@ -13,13 +13,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>model</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index 0e0ac29b79097156616ee3b5e6ee1841abde763a..fe6ef951cf63003625a43b07c8a0024f5962902a 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-hostconfig-ovs</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>utils.mdsal-utils</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>1.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>utils.southbound-utils</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>1.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
index 00cf285e321379276f6e6bc2acdb4a9a40a02618..68eec1c457598b9c48bfcd3b56bc3ee4388275ea 100644 (file)
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-hostconfig</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>pom</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. -->
index 1c63a99b7b1926a642f56fbc36ab90f51a269844..c17cddc1e685fd0f4a89ca3d387ff6b87e5a7e20 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-hostconfig-utils</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index 28906baabfd718d63f677e60aee2cc10ec5807d6..b97285d9a3d0d879c0dd6910daaeb5d8dacb42c9 100644 (file)
@@ -5,19 +5,19 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-hostconfig-vpp</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
   <name>ODL :: neutron :: ${project.artifactId}</name>
   <properties>
-    <netconf.version>1.4.0-SNAPSHOT</netconf.version>
+    <netconf.version>1.5.0-SNAPSHOT</netconf.version>
   </properties>
   <dependencyManagement>
     <dependencies>
index 7faa9aaa079fe90c6aae697c6cabe44b8d2b6dbd..205ac3542a28b076c4b58616a3b546b184acef54 100644 (file)
@@ -80,7 +80,7 @@ public class NeutronHostconfigVppListener implements ClusteredDataTreeChangeList
     @Override
     public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<Node>> changes) {
         LOG.info("onDataTreeChanged: Received Data Tree Changed ...", changes);
-        executorService.submit(() -> {
+        executorService.execute(() -> {
             for (DataTreeModification<Node> change : Preconditions.checkNotNull(changes, "Changes may not be null!")) {
                 processDataTreeModification(change);
             }
index 0a79b6659d0d7752237b6ddc415513c476b1dee8..905fd1e13eda0979af5380b527fc2caf103e6071 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-logger</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index b424b41770cf744be4932f21fdf7af01c91e1aaf..650963bcb5d5392c617176ee89bc11178bc3a466 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-spi</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index a81de475e336defb6cc163eb096f725b43dbf047..c9f0b5304276641d4030008237478199a1188e39 100644 (file)
@@ -6,13 +6,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This class contains behaviour common to Neutron configuration objects.
  */
 public interface INeutronAdminAttributes<T extends INeutronAdminAttributes> extends INeutronBaseAttributes<T> {
+
     Boolean getAdminStateUp();
 
     void setAdminStateUp(Boolean adminStateUp);
index 1fa5c0c891635c113eac73d532b9bde4e0dadfb5..8f65e217ba3398a79d5200d188de6877a39b8dd2 100644 (file)
@@ -6,13 +6,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This class contains behaviour common to Neutron configuration objects.
  */
 public interface INeutronBaseAttributes<T extends INeutronBaseAttributes> extends INeutronObject<T> {
+
     String getName();
 
     void setName(String name);
index 6c87b1f929f7c3ca43ae927cc0ff2c233235f586..d690a2626848f3119f5f1b8794f5c4d9252a4f79 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB bgpvpn objects.
- *
  */
-
 public interface INeutronBgpvpnCRUD extends INeutronCRUD<NeutronBgpvpn> {
     // Nothing Here.
     // This class is defined to use reflection like INuetornBgpvpnCRUD.class
index 1c3dcb9540f5a553b9cf9be4a38efd45eb9c5fcc..a88fc2e7c120fce99a45bec621fb155430ede768 100644 (file)
@@ -5,17 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 import java.util.List;
 
 /**
  * This interface defines the methods for CRUD of NB neutron objects.
- *
  */
-
 public interface INeutronCRUD<T extends INeutronObject<T>> {
+
     /**
      * Applications call this interface method to determine if a particular
      * Neutron object exists.
@@ -24,7 +22,6 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      *            UUID of the Neutron object
      * @return boolean
      */
-
     boolean exists(String uuid);
 
     /**
@@ -36,7 +33,6 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      * @return {@link org.opendaylight.neutron.spi.INeutronObject}
      *          OpenStack Neutron class
      */
-
     T get(String uuid);
 
     /**
@@ -44,7 +40,6 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      *
      * @return List of OpenStackNeutrons objects
      */
-
     List<T> getAll();
 
     /**
@@ -55,7 +50,6 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      *            OpenStackNeutron object
      * @return boolean on whether the object was added or not
      */
-
     boolean add(T input);
 
     /**
@@ -66,7 +60,6 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      *            identifier for the neutron object
      * @return boolean on whether the object was removed or not
      */
-
     boolean remove(String uuid);
 
     /**
@@ -78,6 +71,5 @@ public interface INeutronCRUD<T extends INeutronObject<T>> {
      *            OpenStackNeutron object containing changes to apply
      * @return boolean on whether the object was updated or not
      */
-
     boolean update(String uuid, T delta);
 }
index 51b74192cadaf19dd0021f05108990c3b59879e3..12b23ddb80995273cca6bdadf8e5c555aec2a3ca 100644 (file)
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall objects.
  */
-
 public interface INeutronFirewallCRUD extends INeutronCRUD<NeutronFirewall> {
     // Nothing Here.
     // This class is defined to use reflection.
index 0cb501c93c96476500aa36c391838096995c374f..2375e3bc708a3f4a48b1509c66f2aa431c6b3807 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall Policy objects.
- *
  */
-
 public interface INeutronFirewallPolicyCRUD extends INeutronCRUD<NeutronFirewallPolicy> {
     // Nothing Here.
     // This class is defined to use reflection.
index 7dc8a83286d479e6de88bb97b5a1013758f4089d..69f7237e90573d0acc25be524ff355cded37d916 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall Rule objects.
- *
  */
-
 public interface INeutronFirewallRuleCRUD extends INeutronCRUD<NeutronFirewallRule> {
     // Nothing Here.
     // This class is defined to use reflection.
index beea619494e7ffabd4a9c01fe593c19b702b2477..b14de5cc4acd37fdf54d78c2b9dbf75092286dbc 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB FloatingIp objects.
- *
  */
-
 public interface INeutronFloatingIpCRUD extends INeutronCRUD<NeutronFloatingIp> {
     // Nothing Here.
     // This class is defined to use reflection.
index 60d94217c24e6ef99decb7bdd9627fd8fc0920b3..4d06e4dbf0a3000cde5c9fd180153bee65f9144e 100644 (file)
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack L2gateway objects.
  */
 public interface INeutronL2gatewayCRUD extends INeutronCRUD<NeutronL2gateway> {
-    //Do nothing here.
+    // Do nothing here.
 }
index bf357ecfd6a8c335dfb4a033436d5fb68ecd30f7..716c5a51ad5bb196a739c3f949bf397ff8b70bc1 100644 (file)
@@ -5,14 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack L2gateway
  * Connection objects.
  */
-
 public interface INeutronL2gatewayConnectionCRUD extends INeutronCRUD<NeutronL2gatewayConnection> {
-    //Do nothing here.
+    // Do nothing here.
 }
index c57d603d13f33be58c182ebcf8cce50b5b818067..769111014a4cedd00cd7d186f4b6cbaecf53f3fd 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancer objects.
- *
  */
-
 public interface INeutronLoadBalancerCRUD extends INeutronCRUD<NeutronLoadBalancer> {
     // Nothing Here.
     // This class is defined to use reflection.
index a7405971d508fcbc7d3efbe385d91d31f07bdaf2..847c99259e6c299bf58239373686210d1da31009 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancerHealthMonitor objects.
- *
  */
-
 public interface INeutronLoadBalancerHealthMonitorCRUD extends INeutronCRUD<NeutronLoadBalancerHealthMonitor> {
     // Nothing Here.
     // This class is defined to use reflection.
index dc05eea9c8f1685ae42431042a6dee624adeb6ce..5fc8c4357b2a5fb3d7d61f56f47c6bac18f957cd 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancerListener objects.
- *
  */
-
 public interface INeutronLoadBalancerListenerCRUD extends INeutronCRUD<NeutronLoadBalancerListener> {
     // Nothing Here.
     // This class is defined to use reflection.
index 1a6fab15fbfe8c17b8d92e50a10caf5f3a4bfba5..77a479ca7d477b384f3fbb947fe5fe38ac624943 100644 (file)
@@ -5,17 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 import java.util.List;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancerPool objects.
- *
  */
-
 public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBalancerPool> {
+
     /**
      * Applications call this interface method to determine if a particular
      * NeutronLoadBalancerPoolMember object exists.
@@ -26,7 +24,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      *            UUID of the NeutronLoadBalancerPoolMember object
      * @return boolean
      */
-
     boolean neutronLoadBalancerPoolMemberExists(String poolUuid, String uuid);
 
     /**
@@ -40,7 +37,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      * @return {@link org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember}
      *          OpenStackNeutronLoadBalancerPoolMember class
      */
-
     NeutronLoadBalancerPoolMember getNeutronLoadBalancerPoolMember(String poolUuid, String uuid);
 
     /**
@@ -50,7 +46,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      *            UUID of the NeutronLoadBalancerPool object
      * @return List of OpenStackNetworks objects
      */
-
     List<NeutronLoadBalancerPoolMember> getAllNeutronLoadBalancerPoolMembers(String poolUuid);
 
     /**
@@ -63,7 +58,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      *            OpenStackNetwork object
      * @return boolean on whether the object was added or not
      */
-
     boolean addNeutronLoadBalancerPoolMember(String poolUuid, NeutronLoadBalancerPoolMember input);
 
     /**
@@ -76,7 +70,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      *            identifier for the NeutronLoadBalancerPoolMember object
      * @return boolean on whether the object was removed or not
      */
-
     boolean removeNeutronLoadBalancerPoolMember(String poolUuid, String uuid);
 
     /**
@@ -90,7 +83,6 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      *            OpenStackNeutronLoadBalancerPoolMember object containing changes to apply
      * @return boolean on whether the object was updated or not
      */
-
     boolean updateNeutronLoadBalancerPoolMember(String poolUuid, String uuid, NeutronLoadBalancerPoolMember delta);
 
     /**
@@ -103,6 +95,5 @@ public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBa
      * @return boolean on whether the macAddress is already associated with a
      *             port or not
      */
-
     boolean neutronLoadBalancerPoolMemberInUse(String poolUuid, String uuid);
 }
index a1512eab2639b9aafbc3b165543701fa6a99fb05..9a6f178a357b73f38774efc68b637d6e7635c890 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 public interface INeutronMeteringLabelCRUD extends INeutronCRUD<NeutronMeteringLabel> {
index bd16de602c5c402619ddb9dc4c666088d4416e62..ce91f17c078280d59e18ec1d3e79f1dd59afbd1c 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 public interface INeutronMeteringLabelRuleCRUD extends INeutronCRUD<NeutronMeteringLabelRule> {
index bb65301ebf9dde04188e9561138a89876cc9c8cc..1223c63736ed70e17f00b22c7c28e6c7bda57577 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB network objects.
- *
  */
-
 public interface INeutronNetworkCRUD extends INeutronCRUD<NeutronNetwork> {
     // Nothing Here.
     // This class is defined to use reflection.
index 9d9bbcf5786d73ed286fce2086d7bf02b935a085..dd3f2197fd8514eb39473bd5d6b889f68c73ec5e 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 import java.util.List;
index e2148f9b5b1278d27e2743655f87ed307852149e..4d54b93be23a806a4f85690d71b0f2b6d06ad8fc 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB Port objects.
- *
  */
-
 public interface INeutronPortCRUD extends INeutronCRUD<NeutronPort> {
     // Nothing Here.
     // This class is defined to use reflection.
index b509dc7702dff49ae34778f8386e9c735db607b6..a4703abedc21eabe0dbc28537e1422b946fbc75e 100644 (file)
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Qos Policy objects.
  */
-
 public interface INeutronQosPolicyCRUD extends INeutronCRUD<NeutronQosPolicy> {
     // Nothing Here.
     // This class is defined to use reflection.
index e195fe79b0ccb1d863ec221c9335becacec53016..b88580f416bcc07b45ec49afa04f22e720ad412e 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB Router objects.
- *
  */
-
 public interface INeutronRouterCRUD extends INeutronCRUD<NeutronRouter> {
     // Nothing Here.
     // This class is defined to use reflection.
index 592bb865ac938b87e833af772d9f767862b92118..252d7f1f459f307f7ee810ad79fa37280fd009a7 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB SFC Flow Classifier objects.
- *
  */
 public interface INeutronSFCFlowClassifierCRUD extends INeutronCRUD<NeutronSFCFlowClassifier> {
     // Nothing Here.
index a464bed926558d83d59ec0192a077efa90ea60ff..7f70dd2187d6567050dba32ee0804c3a7d3e24c8 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB SFC Port Chain objects.
- *
  */
 public interface INeutronSFCPortChainCRUD extends INeutronCRUD<NeutronSFCPortChain> {
     // Nothing Here.
index cf04f45662a6c6f1040bd96bed75e2992509322d..88941d2d4546eba29375dc3be692233aac4d747c 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB SFC Port Pair objects.
- *
  */
 public interface INeutronSFCPortPairCRUD extends INeutronCRUD<NeutronSFCPortPair> {
     // Nothing Here.
index 92004e37c2776549c29efeb169ab44d8b393f796..cfb31f3e088b40b53c5a3893f35849001a7b8f9e 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB SFC Port Pair Group objects.
- *
  */
 public interface INeutronSFCPortPairGroupCRUD extends INeutronCRUD<NeutronSFCPortPairGroup> {
     // Nothing Here.
index e241eacaebf735790bc88cad5e42c7f651461e54..241e85af93d8ae2494e5256ecd3db5060b146880 100644 (file)
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Security Group objects.
  */
-
 public interface INeutronSecurityGroupCRUD extends INeutronCRUD<NeutronSecurityGroup> {
     // Nothing Here.
     // This class is defined to use reflection.
index 3ab436ef02b2448aed2d4b41a6c9eae82b95fec6..ade8ed3b76f736a22c8cafe26d344780a448ba9f 100644 (file)
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Security Rule objects.
  */
-
 public interface INeutronSecurityRuleCRUD extends INeutronCRUD<NeutronSecurityRule> {
     // Nothing Here.
     // This class is defined to use reflection.
index 4ad80181eee29aaff7e06ee15f22f8a95c752b0f..8d7a83b15524cb1b86cfa19f64c7500d58a1baa3 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB Subnet objects.
- *
  */
-
 public interface INeutronSubnetCRUD extends INeutronCRUD<NeutronSubnet> {
     // Nothing Here.
     // This class is defined to use reflection.
index 849be95b5e998e6faf0848b07792016207aa4eda..73d085cc1ee580313cc35811e4ac020dfcba4631 100644 (file)
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Tap Flow objects.
  */
-
 public interface INeutronTapFlowCRUD extends INeutronCRUD<NeutronTapFlow> {
+
     /**
      * Applications call this interface method to check if a NeutronTapFlow object exists.
      *
index 2b4c2b4d033d49326cdaed484421d70918058a29..230947b6e3e55ee75d0a5a1073a853b4b099140a 100644 (file)
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB OpenStack Tap Service objects.
  */
-
 public interface INeutronTapServiceCRUD extends INeutronCRUD<NeutronTapService> {
     // Nothing Here.
     // This class is defined to use reflection.
index 08812694e21dd46f66ef9f2b51ea7494a6fa5ee1..2875297e0d77f11a08816609b02f3532b8dfef1f 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB trunk objects.
- *
  */
-
 public interface INeutronTrunkCRUD extends INeutronCRUD<NeutronTrunk> {
     // Nothing Here.
     // This class is defined to use reflection like INeutornTrunkCRUD.class
index 7d54dda61d5210fdaa1bbccfb636cc448bafb4f9..375561e7ea1df970efef9789bab7bef9a5bbfab6 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 public interface INeutronVpnIkePolicyCRUD extends INeutronCRUD<NeutronVpnIkePolicy> {
index 6b722457c679feca41c5aa1463afeff615f46b64..bd555751390c80852359208fe5d8b502e632c969 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 public interface INeutronVpnIpSecPolicyCRUD extends INeutronCRUD<NeutronVpnIpSecPolicy> {
index 061204f354b42b8a76f18f172fbbbab280d5673b..52ed87bcd9a04a6410467a55df642f2692655415 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 public interface INeutronVpnIpSecSiteConnectionsCRUD extends INeutronCRUD<NeutronVpnIpSecSiteConnection> {
index 157518e44a1aee0be9d9c065af65c5f2da8287af..9009214889d9fcb0639f9cf9258f8afda57f50e7 100644 (file)
@@ -5,14 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.spi;
 
 /**
  * This interface defines the methods for CRUD of NB VPNService objects.
- *
  */
-
 public interface INeutronVpnServiceCRUD extends INeutronCRUD<NeutronVpnService> {
     // Nothing Here.
     // This class is defined to use reflection.
index bd81eef88f78845f1fdae9c240f08d421d0d3ce2..0a93ffcf26245f3f45e5e1547ccbd720fa18da7c 100644 (file)
@@ -9,7 +9,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -17,8 +16,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public abstract class NeutronAdminAttributes<T extends NeutronAdminAttributes> extends NeutronBaseAttributes<T>
-        implements Serializable, INeutronAdminAttributes<T> {
+public abstract class NeutronAdminAttributes<T extends NeutronAdminAttributes<T>> extends NeutronBaseAttributes<T>
+        implements INeutronAdminAttributes<T> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "true", name = "admin_state_up")
@@ -30,18 +29,29 @@ public abstract class NeutronAdminAttributes<T extends NeutronAdminAttributes> e
     public NeutronAdminAttributes() {
     }
 
+    @Override
     public Boolean getAdminStateUp() {
         return adminStateUp;
     }
 
+    public boolean isAdminStateUp() {
+        if (adminStateUp == null) {
+            return true;
+        }
+        return adminStateUp;
+    }
+
+    @Override
     public void setAdminStateUp(Boolean adminStateUp) {
         this.adminStateUp = adminStateUp;
     }
 
+    @Override
     public String getStatus() {
         return status;
     }
 
+    @Override
     public void setStatus(String status) {
         this.status = status;
     }
index e6ca2c99d6a306a61ceaaf46000937cca55338f3..f4d274d028730a9ad58007b758ca93176e12a83f 100644 (file)
@@ -9,7 +9,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -17,8 +16,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public abstract class NeutronBaseAttributes<T extends NeutronBaseAttributes> extends NeutronObject<T>
-        implements Serializable, INeutronBaseAttributes<T> {
+public abstract class NeutronBaseAttributes<T extends NeutronBaseAttributes<T>> extends NeutronObject<T>
+        implements INeutronBaseAttributes<T> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "name")
index dd7a57a46c05c1c1d644c20eec036c7f8c9cd126..1684d5b0603e499ba03cc89e33620f14c15a0522 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "bgpvpn")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> implements Serializable {
+public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
@@ -60,6 +59,7 @@ public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> i
     public NeutronBgpvpn() {
     }
 
+    @Override
     public void initDefaults() {
         super.initDefaults();
         if (type == null) {
@@ -70,10 +70,6 @@ public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> i
         }
     }
 
-    public boolean isAdminStateUp() {
-        return adminStateUp;
-    }
-
     public boolean isAutoAggregate() {
         return autoAggregate;
     }
index ca384d596d00cb7ddc9497baaf12010c2c569d49..659293d5d623820fa3fafa7423a1452766327fde 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -33,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall> implements Serializable {
+public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "true", name = "admin_state_up")
index 5e9cfb969fa3f408c6723a23659a96b47546c0da..ff44a5a8329cdb23ea1bea56ae89b361fc633a63 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -32,7 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewallPolicy extends NeutronBaseAttributes<NeutronFirewallPolicy> implements Serializable {
+public final class NeutronFirewallPolicy extends NeutronBaseAttributes<NeutronFirewallPolicy> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "false", name = "shared")
index 3fe580b3a81998ea20e260920e67168440f839e5..6bcd09faa126de7b94c793c3726403c78abec761 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -44,7 +43,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFirewallRule extends NeutronBaseAttributes<NeutronFirewallRule> implements Serializable {
+public final class NeutronFirewallRule extends NeutronBaseAttributes<NeutronFirewallRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "false", name = "shared")
index cff693525db7a38f1d28fa88338387bc49cdef2b..73bf637a9015f4a8efc878430da82f3ec18a2025 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronFloatingIp
-        extends NeutronObject<NeutronFloatingIp> implements Serializable, INeutronObject<NeutronFloatingIp> {
+public final class NeutronFloatingIp extends NeutronObject<NeutronFloatingIp> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index 22321bb4b729d2a2a1aef431bdbd9e48071851ca..28c68d3e0f309b16aaa4f4735c0e3a4663f10f01 100644 (file)
@@ -8,15 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "l2gateway")
-public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gateway>
-        implements Serializable {
+public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gateway> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "devices")
index d8b2b87af08f390a8e4643b78a2fe0361a5e544d..e7befef39c37f14e267119a84120bef9eff8e90d 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,8 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "l2gatewayConnection")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronL2gatewayConnection extends NeutronBaseAttributes<NeutronL2gatewayConnection>
-            implements Serializable {
+public final class NeutronL2gatewayConnection extends NeutronBaseAttributes<NeutronL2gatewayConnection> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "gateway_id")
@@ -56,10 +55,14 @@ public final class NeutronL2gatewayConnection extends NeutronBaseAttributes<Neut
         this.segmentID = segmentID;
     }
 
+    // getPortID differ only by capitalization with NeutronTrunk.getPortId but it's not worth changing the API and
+    // disrupting downstream users just for that reason.
+    @SuppressFBWarnings("NM_CONFUSING")
     public String getPortID() {
         return portID;
     }
 
+    @SuppressFBWarnings("NM_CONFUSING")
     public void setPortID(String portID) {
         this.portID = portID;
     }
index 755e41fb6ee33df1d151471d07ae8fa13252fbe0..ee72891038577ded953e359cc1ffc6f9c9cb84a6 100644 (file)
@@ -8,11 +8,10 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 
-public final class NeutronL2gatewayDevice extends NeutronID implements Serializable {
+public final class NeutronL2gatewayDevice extends NeutronID {
 
     private static final long serialVersionUID = 1L;
 
index 9b4dff1741792ac207ab0a42a0472b1021c16bf1..2436956ae3c4ad4a856d9a662f1d71ef119c9789 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -32,7 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancer extends NeutronAdminAttributes<NeutronLoadBalancer> implements Serializable {
+public final class NeutronLoadBalancer extends NeutronAdminAttributes<NeutronLoadBalancer> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "vip_address")
index 768dbf17146c9421de914129b2d4e6bcadd4ba05..325f0c6b843ba377962ae7d0413f029100788be7 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -38,8 +37,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerHealthMonitor extends NeutronObject<NeutronLoadBalancerHealthMonitor>
-        implements Serializable, INeutronObject<NeutronLoadBalancerHealthMonitor> {
+public final class NeutronLoadBalancerHealthMonitor extends NeutronObject<NeutronLoadBalancerHealthMonitor> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "type")
index ac9cb5a77bfe38e7619026e319e2ba3d950c1399..bd1bf5d47f67dbe238a96b72e981b48dc733afa1 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -39,8 +38,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<NeutronLoadBalancerListener>
-        implements Serializable {
+public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<NeutronLoadBalancerListener> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "default_pool_id")
index 8d9ccca78a2ca244000562bbc7f69045537ea0ac..bcfdeda2975a3b03aff3cbfc7edf3462cb8aa595 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -37,8 +36,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<NeutronLoadBalancerPool>
-        implements Serializable {
+public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<NeutronLoadBalancerPool> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "protocol")
index f0687bb05e5b9d53443dc1d67e5ca0338005744c..38915c0c6bba599a10fc00a8acb5f6a7b59927b8 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -17,8 +16,7 @@ import javax.xml.bind.annotation.XmlTransient;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronLoadBalancerPoolMember extends NeutronObject<NeutronLoadBalancerPoolMember>
-        implements Serializable, INeutronObject<NeutronLoadBalancerPoolMember> {
+public final class NeutronLoadBalancerPoolMember extends NeutronObject<NeutronLoadBalancerPoolMember> {
     private static final long serialVersionUID = 1L;
 
     /**
index 5b434bb5e122a4ea924b3cbd4b3053b8263b77bb..36c7ce4814fabafb6c1aa85dfea4857c98f3975e 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronMeteringLabel extends NeutronBaseAttributes<NeutronMeteringLabel> implements Serializable {
+public final class NeutronMeteringLabel extends NeutronBaseAttributes<NeutronMeteringLabel> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "false", name = "shared")
index 6ee9f552b43a0310a7fa51e3fe4701e1a38be059..2acbf768ca8c2236b6542587bbc1e0b585fc1c7d 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronMeteringLabelRule extends NeutronObject<NeutronMeteringLabelRule>
-        implements Serializable, INeutronObject<NeutronMeteringLabelRule> {
+public final class NeutronMeteringLabelRule extends NeutronObject<NeutronMeteringLabelRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "direction")
index 5c48228eeb6ccb7b169d03554aca86ff3817f6c7..174575163d8a8dc8e0a0face6c34ffaef93b1760 100644 (file)
@@ -8,7 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,7 +17,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "network")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork> implements Serializable {
+// Non-transient non-serializable instance field 'segments' - we have to assume/hope users will set a Serializable List
+// instance.
+@SuppressFBWarnings("SE_BAD_FIELD")
+public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
@@ -75,11 +78,11 @@ public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork>
         }
     }
 
-    public boolean isAdminStateUp() {
-        return adminStateUp;
-    }
-
     public boolean isShared() {
+        if (shared == null) {
+            return false;
+        }
+
         return shared;
     }
 
@@ -92,6 +95,10 @@ public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork>
     }
 
     public boolean isRouterExternal() {
+        if (routerExternal == null) {
+            return false;
+        }
+
         return routerExternal;
     }
 
@@ -163,7 +170,7 @@ public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork>
     public boolean extractField(String field, NeutronNetwork ans) {
         switch (field) {
             case "shared":
-                ans.setShared(shared);
+                ans.setShared(isShared());
                 break;
             case "external":
                 ans.setRouterExternal(this.getRouterExternal());
index cfd4302f5c875babac49b1d65cf8575f3a47909c..d138cc4a39c406c3d3d910c21b28f28443791740 100644 (file)
@@ -9,7 +9,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -24,8 +23,7 @@ import org.slf4j.LoggerFactory;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public abstract class NeutronObject<T extends NeutronObject> extends NeutronID
-        implements Serializable, INeutronObject<T> {
+public abstract class NeutronObject<T extends NeutronObject<T>> extends NeutronID implements INeutronObject<T> {
     // T extends NeutronObject as 0th type argument. Used by extractFields()
     private static final int NEUTRON_OBJECT_CLASS_TYPE_INDEX = 0;
 
index f990d371480395ef747ce02f1d207f9f0c7137fa..4de5dffd0f7dde90a805b41550861264d23f905b 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,7 +20,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> implements Serializable {
+public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
@@ -90,13 +89,6 @@ public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> imple
         this.networkUUID = networkUUID;
     }
 
-    public boolean isAdminStateUp() {
-        if (adminStateUp == null) {
-            return true;
-        }
-        return adminStateUp;
-    }
-
     public String getMacAddress() {
         return macAddress;
     }
index bbc64df5761cc5a5135c37c599882cfd24165fe1..52c4a1e9f866797d8d05cf9f94d6337e04a1b847 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,8 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosBandwidthLimitRule extends NeutronObject<NeutronQosBandwidthLimitRule>
-        implements Serializable, INeutronObject<NeutronQosBandwidthLimitRule> {
+public final class NeutronQosBandwidthLimitRule extends NeutronObject<NeutronQosBandwidthLimitRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "max_kbps")
index abc68ec8bddcbbcd5520ce9c3df1031a2118aef8..6e69e579abf4f4ce8a72a5445f6ace2b25c6bf04 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosDscpMarkingRule extends NeutronObject<NeutronQosDscpMarkingRule>
-        implements Serializable, INeutronObject<NeutronQosDscpMarkingRule> {
+public final class NeutronQosDscpMarkingRule extends NeutronObject<NeutronQosDscpMarkingRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "dscp_mark")
index 3f7df0989c604f5f36400fcbde75f5dc74e8a3b1..6c056c0df933fd65078dac20c772a04dd0fb976a 100644 (file)
@@ -7,7 +7,6 @@
  */
 
 package org.opendaylight.neutron.spi;
-import java.io.Serializable;
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,8 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosMinimumBandwidthRule extends NeutronObject<NeutronQosMinimumBandwidthRule>
-    implements Serializable, INeutronObject<NeutronQosMinimumBandwidthRule> {
+public final class NeutronQosMinimumBandwidthRule extends NeutronObject<NeutronQosMinimumBandwidthRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "min_kbps")
@@ -66,4 +64,4 @@ public final class NeutronQosMinimumBandwidthRule extends NeutronObject<NeutronQ
                 + '\'' + ", qosMinimumBandwidthDirection='" + direction + '\''
                 + '}';
     }
-}
\ No newline at end of file
+}
index 97965796caf09c96df2042e348e68b8a0a733c3a..b17181ae2b5bda7d1f4d281d1a0f9f74147d73f2 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,7 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPolicy> implements Serializable {
+public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPolicy> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(defaultValue = "false", name = "shared")
index e9a1e328fcc9b3b33ad10219d5909e80c9d5d053..cf49da79e51beef93b165f93bd207918114d9188 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,8 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronRouter extends NeutronAdminAttributes<NeutronRouter>
-        implements Serializable {
+public final class NeutronRouter extends NeutronAdminAttributes<NeutronRouter> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
@@ -38,13 +36,6 @@ public final class NeutronRouter extends NeutronAdminAttributes<NeutronRouter>
     public NeutronRouter() {
     }
 
-    public boolean isAdminStateUp() {
-        if (adminStateUp == null) {
-            return true;
-        }
-        return adminStateUp;
-    }
-
     public NeutronRouterNetworkReference getExternalGatewayInfo() {
         return externalGatewayInfo;
     }
index 99e2b953f3c3bcd7ea1b04acc065efe2aabab5d3..2961bc996f614114906fd0c1947353e00ee8d01f 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronRouterInterface extends NeutronObject<NeutronRouterInterface>
-        implements Serializable, INeutronObject<NeutronRouterInterface> {
+public final class NeutronRouterInterface extends NeutronObject<NeutronRouterInterface> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index f9c629c646a34eec1e107152a3edd987bf792a65..9e01a1db8a9d601d3ed23ab577b4d83914ff1a4d 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,8 +17,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCFlowClassifier extends NeutronBaseAttributes<NeutronSFCFlowClassifier>
-        implements Serializable {
+public final class NeutronSFCFlowClassifier extends NeutronBaseAttributes<NeutronSFCFlowClassifier> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) API v1.0 Reference for description of
index 4db17cdf0954d0f80275414851e10e4a18c703dc..9caa8e16c618011b62df023c24a780ff37907922 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,7 +17,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortChain extends NeutronBaseAttributes<NeutronSFCPortChain> implements Serializable {
+public final class NeutronSFCPortChain extends NeutronBaseAttributes<NeutronSFCPortChain> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Chain API v1.0 Reference
index da291dcbab148e8a0f9540fb4e0436884c07bbc8..faeb9c5c8566a2923789f40a28fbc5b8eefb0488 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,7 +17,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortPair extends NeutronBaseAttributes<NeutronSFCPortPair> implements Serializable {
+public final class NeutronSFCPortPair extends NeutronBaseAttributes<NeutronSFCPortPair> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Pair API v1.0 Reference
index ecf4c5459f1d31b566a5043397a7b413216611f9..319b82f25b8f00626a0c14293bfc1750de296cc9 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,8 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSFCPortPairGroup extends NeutronBaseAttributes<NeutronSFCPortPairGroup>
-        implements Serializable {
+public final class NeutronSFCPortPairGroup extends NeutronBaseAttributes<NeutronSFCPortPairGroup> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Networking SFC (networking-sfc) Port Pair Group API v1.0
index c876ae3930122b55830d13b0aa85aed1c8937568..591e8927409c1369ab37e114c4efed53e2f554fc 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -26,7 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSecurityGroup extends NeutronBaseAttributes<NeutronSecurityGroup> implements Serializable {
+public final class NeutronSecurityGroup extends NeutronBaseAttributes<NeutronSecurityGroup> {
     private static final long serialVersionUID = 1L;
 
     public NeutronSecurityGroup() {
index bdfb2021048e28227d5925abe3ae988ad243a0bf..20de13342e4e51e37de9b9a78f648c0640d0dd81 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -33,8 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSecurityRule extends NeutronObject<NeutronSecurityRule>
-        implements Serializable, INeutronObject<NeutronSecurityRule> {
+public final class NeutronSecurityRule extends NeutronObject<NeutronSecurityRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "direction")
index f3e848b6c9a3d719f4124200cad55fab96a36e04..ba70c250b63627c4f4bbf2a44e95045011433000 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import com.google.common.net.InetAddresses;
-import java.io.Serializable;
 import java.math.BigInteger;
 import java.net.Inet6Address;
 import java.util.ArrayList;
@@ -25,7 +24,7 @@ import org.slf4j.LoggerFactory;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> implements Serializable {
+public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronCRUDInterfaces.class);
 
     private static final long serialVersionUID = 1L;
@@ -234,12 +233,12 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> im
             // convert to byte array
             byte[] addrBytes = ((Inet6Address) InetAddresses.forString(parts[0])).getAddress();
             for (int index = length; index < IPV6_LENGTH; index++) {
-                if (((((int) addrBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
-                        & (1 << (IPV6_BYTE_OFFSET - (index % IPV6_LENGTH_BYTES)))) != 0) {
-                    return (false);
+                if ((addrBytes[index / IPV6_LENGTH_BYTES] & IPV6_LSB_MASK
+                        & 1 << IPV6_BYTE_OFFSET - index % IPV6_LENGTH_BYTES) != 0) {
+                    return false;
                 }
             }
-            return (true);
+            return true;
         }
         return false;
     }
@@ -280,7 +279,7 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> im
                 try {
                     SubnetUtils util = new SubnetUtils(cidr);
                     SubnetInfo info = util.getInfo();
-                    if (gatewayIp == null || ("").equals(gatewayIp)) {
+                    if (gatewayIp == null || "".equals(gatewayIp)) {
                         gatewayIp = info.getLowAddress();
                     }
                     if (allocationPools.size() < 1) {
@@ -305,7 +304,7 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> im
                 BigInteger mask = BigInteger.ONE.shiftLeft(length).subtract(BigInteger.ONE);
                 String highAddress = NeutronSubnetIpAllocationPool
                         .bigIntegerToIp(lowAddressBi.add(mask).subtract(BigInteger.ONE));
-                if (gatewayIp == null || ("").equals(gatewayIp)) {
+                if (gatewayIp == null || "".equals(gatewayIp)) {
                     gatewayIp = lowAddress;
                 }
                 if (allocationPools.size() < 1) {
@@ -338,14 +337,14 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> im
             byte[] cidrBytes = ((Inet6Address) InetAddresses.forString(parts[0])).getAddress();
             byte[] ipBytes = ((Inet6Address) InetAddresses.forString(ipAddress)).getAddress();
             for (int index = 0; index < length; index++) {
-                if (((((int) cidrBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET
-                        - (index % IPV6_LENGTH_BYTES)))) != (
-                            (((int) ipBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
-                            & (1 << (IPV6_BYTE_OFFSET - (index % IPV6_LENGTH_BYTES))))) {
-                    return (false);
+                if ((cidrBytes[index / IPV6_LENGTH_BYTES] & IPV6_LSB_MASK & 1 << IPV6_BYTE_OFFSET
+                        - index % IPV6_LENGTH_BYTES) != (
+                            ipBytes[index / IPV6_LENGTH_BYTES] & IPV6_LSB_MASK
+                            & 1 << IPV6_BYTE_OFFSET - index % IPV6_LENGTH_BYTES)) {
+                    return false;
                 }
             }
-            return (true);
+            return true;
         }
         return false;
     }
index e58b8dfafe1c46e03fa405cf786863901a883305..8cf9796b3a67739dfb707365b408a3c95f1f2a2b 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronTapFlow extends NeutronBaseAttributes<NeutronTapFlow> implements Serializable {
+public final class NeutronTapFlow extends NeutronBaseAttributes<NeutronTapFlow> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "tap_service_id")
index 5072ea3f0195a6546ee929b501a4ee66e8de94a2..f4b45e4d59db6da232926fa98f002e7122808e86 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronTapService extends NeutronBaseAttributes<NeutronTapService> implements Serializable {
+public final class NeutronTapService extends NeutronBaseAttributes<NeutronTapService> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "port_id")
index 5530223ba32cc22e9f3b4329992a7ed1ce2c59a7..832470485e10691623cdaabc661a6cf57efb0339 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,7 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "trunk")
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronTrunk extends NeutronAdminAttributes<NeutronTrunk> implements Serializable {
+public final class NeutronTrunk extends NeutronAdminAttributes<NeutronTrunk> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "port_id")
index 307aa2459e372c10e009686a195a086b4727d00b..b6339825e32548b2eb40d5acfdeccc3499d3b39e 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVpnIkePolicy extends NeutronBaseAttributes<NeutronVpnIkePolicy> implements Serializable {
+public final class NeutronVpnIkePolicy extends NeutronBaseAttributes<NeutronVpnIkePolicy> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index aa097adc43267725367c6fea66e48bd4f3c6d932..e8b697c2603367c88ab04f003923c61c2f9cec41 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVpnIpSecPolicy extends NeutronBaseAttributes<NeutronVpnIpSecPolicy> implements Serializable {
+public final class NeutronVpnIpSecPolicy extends NeutronBaseAttributes<NeutronVpnIpSecPolicy> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index 2555e23d3327e8c9014e56c20a0e654f2fbdc4b0..ff685769cd21be6377fc13d05d004af95cff5d1d 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,8 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVpnIpSecSiteConnection extends NeutronAdminAttributes<NeutronVpnIpSecSiteConnection>
-        implements Serializable {
+public final class NeutronVpnIpSecSiteConnection extends NeutronAdminAttributes<NeutronVpnIpSecSiteConnection> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index 458300f80cabe3a6eb65a9a3370fffef51a8f4fc..e7264933d48d4c279aadfaa642958e65cb666511 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -16,7 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronVpnService extends NeutronAdminAttributes<NeutronVpnService> implements Serializable {
+public final class NeutronVpnService extends NeutronAdminAttributes<NeutronVpnService> {
     private static final long serialVersionUID = 1L;
 
     // See OpenStack Network API v2.0 Reference for description of
index aeb65b3e17c71cea2a474b429e43fb9b3599919b..d2b49cd8c6882509b246784963cf3fdd77861ed6 100644 (file)
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>northbound-api</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index 320463f97cd2591c88e49b484b32d59e80fe19e5..46601b10692066f526c66b33c02675ef1c0bbbd1 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronBgpvpn;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronBgpvpnRequest implements INeutronRequest<NeutronBgpvpn> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index 2ea5ce1225402fb080a5e0780e3cbf280f6e56be..b971c7a4b5c5d52ff234ed5d120e5bb8d163ce6d 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronFirewallPolicyRequest implements INeutronRequest<NeutronFirewallPolicy> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index 9f95fcc9660f0e876ba01ab89c1df0f1b293f3cb..35bb0b528b590e4d7865249a4ccb25ad71d945ab 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronFirewall;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronFirewallRequest implements INeutronRequest<NeutronFirewall> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index 0f3d7be0248f5ad0d4c9b161832e34e25ded2d20..c5bab0b374b7dae6018f657cab773e8bb83aa213 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronFirewallRule;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronFirewallRuleRequest implements INeutronRequest<NeutronFirewallRule> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index ee0cf7bab268a2d136fa00c497c831d6dc17e98d..9487703d977bc78044785f3cf993ed970b13b77c 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronFloatingIp;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronFloatingIpRequest implements INeutronRequest<NeutronFloatingIp> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index d3acbb6d4595d29e53614e5dfebb92c9bb576758..74552472ca8956b50c4367c9433b6577bfbc5dfe 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronL2gatewayConnection;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronL2gatewayConnectionRequest implements INeutronRequest<NeutronL2gatewayConnection> {
     @XmlElement(name = "l2gateway_connection")
     NeutronL2gatewayConnection singleton;
index 72ffcbb456a1e6cffccc901b8f3dc93712b81458..d568ad4ba1001f9994a943adde61106d8a90a073 100644 (file)
@@ -8,10 +8,12 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import org.opendaylight.neutron.spi.NeutronL2gateway;
 
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronL2gatewayRequest implements INeutronRequest<NeutronL2gateway> {
     @XmlElement(name = "l2_gateway")
     NeutronL2gateway singleton;
index b587ea19d15bc3c1a452ee10e9ba61e808e201d7..a23c74e408ee69a7ade97de14a8955149c5453a7 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronLoadBalancerHealthMonitorRequest
     implements INeutronRequest<NeutronLoadBalancerHealthMonitor> {
     /**
index 191f652bb92ee6c0e4966cb28f4980f68cd2ad47..47756c27ae1a15fb5d69c6e8a5e554bf3eb29034 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerListener;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronLoadBalancerListenerRequest implements INeutronRequest<NeutronLoadBalancerListener> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index 800c317410a1913b7f8958ec2d08b121afcb23cc..f9724cd43b4ef6cd07ccc23c34450a543e9508b5 100644 (file)
@@ -8,10 +8,12 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember;
 
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronLoadBalancerPoolMemberRequest implements INeutronRequest<NeutronLoadBalancerPoolMember> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index 49dde24bf16ebfd82919d71713e9b7da0dbecd0a..2bfd997b66fea5d45261567d9ff0d560e9bc7fcf 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerPool;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronLoadBalancerPoolRequest implements INeutronRequest<NeutronLoadBalancerPool> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index 4b4c96ec4627db5980a1955aa35b4498f9e8ec01..1df94a6540a35e52b31e794971a0dfb6c6a6c5b8 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancer;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronLoadBalancerRequest implements INeutronRequest<NeutronLoadBalancer> {
     /**
      * See OpenStack Network API v2.0 Reference for description of the following link.
index d179b8b8121628aa2082a0ac2ef023dd09f86096..750bf5d63609736d03dc8d0d219c4654bf94a7d6 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabel;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronMeteringLabelRequest implements INeutronRequest<NeutronMeteringLabel> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index dc61ce23490f0bc8bdac30d40968538294492420..42a1046014fbd80f72b0e0fa9a11076eebfc5120 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabelRule;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronMeteringLabelRuleRequest implements INeutronRequest<NeutronMeteringLabelRule> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index ec77e90690e8e4f272ef5181c137b62d84ab2e65..83578c39d2abfbe5675323e1167b3967bdd3eabc 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronNetwork;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronNetworkRequest implements INeutronRequest<NeutronNetwork> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index fda8a35410fe57bc5a25e16ef5070da70bfb2e96..c891c34aedb026d47f19c00dd572ac2cad341dba 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronPort;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronPortRequest implements INeutronRequest<NeutronPort> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index 29f53dc168a75b7498e032bc8f25dd1c52c69d0d..1d270e454b9c6011dc5d531cb2218976210ac582 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronQosPolicy;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronQosPolicyRequest implements INeutronRequest<NeutronQosPolicy> {
     @XmlElement(name = "policy")
     NeutronQosPolicy singleton;
index d4c404d6b826e83139ac483e35826a618a4cb69d..4a07cad16105f5e08e765ae780060867d10e8ddd 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronRouter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronRouterRequest implements INeutronRequest<NeutronRouter> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index e026ce9b8de73140063c33d293d62b4e15c8eadb..865b5c6ae68451dae8d1ed435520cde7563e89a6 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,6 +17,7 @@ import org.opendaylight.neutron.spi.NeutronSFCFlowClassifier;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSFCFlowClassifierRequest implements INeutronRequest<NeutronSFCFlowClassifier> {
     // See OpenStack Networking SFC (networking-sfc) API v1.0 Reference for description of
     // annotated attributes
index 910085c62e959c2271281feb3e0d06d179b82aa5..5a6eba03e3b2764c11cd665eb2bbbb0fee24b5e0 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,6 +17,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortChain;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSFCPortChainRequest implements INeutronRequest<NeutronSFCPortChain> {
     // See OpenStack Networking SFC (networking-sfc) Port Chain API v1.0 Reference
     // for description of annotated attributes
index 844e4458020225c26c33dd4834601103d059edf6..d54cecb99cfed7e3c57ea3a6a19f48b98cdf03e2 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,6 +17,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPairGroup;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSFCPortPairGroupRequest implements INeutronRequest<NeutronSFCPortPairGroup> {
     // See OpenStack Networking SFC (networking-sfc) Port Pair Group API v1.0 Reference
     // for description of annotated attributes
index 587fd06d8a18f2bb52c7276cf6ae81f4d9f71aa8..30382fd85ed723f1a71d3592995b2557182e3c7e 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,6 +17,7 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPair;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSFCPortPairRequest implements INeutronRequest<NeutronSFCPortPair> {
     // See OpenStack Networking SFC (networking-sfc) Port Pair API v1.0 Reference
     // for description of annotated attributes
index 0a8771bd3fcdd892fa4bf556068e4be870bd0ec6..3ef3e40f90f8b2239e97adc044cf36ef6170d97f 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSecurityGroupRequest implements INeutronRequest<NeutronSecurityGroup> {
     /**
     * See OpenStack Network API v2.0 Reference for a
index da12fd38a3c8e7de4de88f73a6f6d62c636db130..ec91da7350138b752a2d8886d5f447f1458f8de8 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityRule;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSecurityRuleRequest implements INeutronRequest<NeutronSecurityRule> {
     /**
      * See OpenStack Network API v2.0 Reference for a
index 2a5806c0a5680478d88eaefddf98b2d136df2dc0..aebf5454b8654845193f4fa2fc145f3a79918498 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronSubnet;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronSubnetRequest implements INeutronRequest<NeutronSubnet> {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
index d124d821a051c871b08d007800cc09c10d7ae048..b09e1e97e36f4841a52f105e8daa7e58e0b30f5a 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronTapFlow;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronTapFlowRequest implements INeutronRequest<NeutronTapFlow> {
     @XmlElement(name = "tap_flow")
     NeutronTapFlow singleton;
index 456e5dd2b8e95cc8a913343fc0134bb3238f8183..98335293205dbaebe24b13a8103a8384353e713d 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronTapService;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronTapServiceRequest implements INeutronRequest<NeutronTapService> {
     @XmlElement(name = "tap_service")
     NeutronTapService singleton;
index 884611152cb817a55359a508cdf00d7325b74033..4e925eb3169ebf0fd50e893f606c2503726c8eb1 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronTrunk;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronTrunkRequest implements INeutronRequest<NeutronTrunk> {
 
     @XmlElement(name = "trunk")
index 3ab9b90b68e8bf7dfefdc89d390312d7b30d381e..e46a368e0073d85b62689f7c31e6cb27c4c40a1f 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIkePolicy;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronVpnIkePolicyRequest implements INeutronRequest<NeutronVpnIkePolicy> {
     @XmlElement(name = "ikepolicy")
     NeutronVpnIkePolicy singleton;
index 276293d6cb465e706daa8abd3de6fc0b2ea37a3b..07fafda9f43a8f6c7ba96776e0449db2039410a4 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIpSecPolicy;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronVpnIpSecPolicyRequest implements INeutronRequest<NeutronVpnIpSecPolicy> {
     @XmlElement(name = "ipsecpolicy")
     NeutronVpnIpSecPolicy singleton;
index c632aea811e667e60eca1efc456c74fcdd87458a..a2337bc605c526b15bd54b19d191a5f5f4d66759 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIpSecSiteConnection;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronVpnIpSecSiteConnectionRequest implements INeutronRequest<NeutronVpnIpSecSiteConnection> {
     @XmlElement(name = "ipsec_site_connection")
     NeutronVpnIpSecSiteConnection singleton;
index 809a354c9527d222d96ca869f0b309d15eab4dd3..374a6d44ee70a6bfbdf4042ddb457e98b59bddc7 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.neutron.northbound.api;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -17,6 +18,7 @@ import org.opendaylight.neutron.spi.NeutronVpnService;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
+@SuppressFBWarnings("URF_UNREAD_FIELD")
 public final class NeutronVpnServiceRequest implements INeutronRequest<NeutronVpnService> {
     @XmlElement(name = "vpnservice")
     NeutronVpnService singleton;
index 12953631291b41184281136a6ef55e68f37edda4..78ae301c6600c6ee98d4e4fe9e46d0a6606e83eb 100644 (file)
@@ -21,12 +21,8 @@ import org.opendaylight.neutron.spi.NeutronSubnet;
 
 public final class PaginatedRequestFactory {
 
-    private static final Comparator<INeutronObject> NEUTRON_OBJECT_COMPARATOR = new Comparator<INeutronObject>() {
-        @Override
-        public int compare(INeutronObject o1, INeutronObject o2) {
-            return o1.getID().compareTo(o2.getID());
-        }
-    };
+    private static final Comparator<INeutronObject<?>> NEUTRON_OBJECT_COMPARATOR =
+        (o1, o2) -> o1.getID().compareTo(o2.getID());
 
     public static class PaginationResults<T extends INeutronObject<T>> {
         List<T> collection;
@@ -38,8 +34,9 @@ public final class PaginatedRequestFactory {
         }
     }
 
-    private static final class MarkerObject extends NeutronObject<MarkerObject>
-            implements INeutronObject<MarkerObject> {
+    private static final class MarkerObject extends NeutronObject<MarkerObject> {
+        private static final long serialVersionUID = 1L;
+
         private final String id;
 
         MarkerObject(String id) {
index 67b613cd8db8dcf5bdebb85bf5398f9b09dc06c2..2ef97da738eabcee2a12f5d78acaa6a30bd020ce 100644 (file)
@@ -1,71 +1,59 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"\r
-        version="3.0">\r
-  <servlet>\r
-    <servlet-name>JAXRSNeutron</servlet-name>\r
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>\r
-    <init-param>\r
-      <param-name>javax.ws.rs.Application</param-name>\r
-      <param-value>org.opendaylight.neutron.northbound.api.NeutronNorthboundRSApplication</param-value>\r
-    </init-param>\r
-    <load-on-startup>1</load-on-startup>\r
-  </servlet>\r
-\r
-  <servlet-mapping>\r
-    <servlet-name>JAXRSNeutron</servlet-name>\r
-    <url-pattern>/*</url-pattern>\r
-  </servlet-mapping>\r
-\r
-  <context-param>\r
-    <param-name>shiroEnvironmentClass</param-name>\r
-    <param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>\r
-  </context-param>\r
-\r
-  <listener>\r
-    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>\r
-  </listener>\r
-\r
-  <filter>\r
-    <filter-name>ShiroFilter</filter-name>\r
-    <filter-class>org.opendaylight.aaa.shiro.filters.AAAShiroFilter</filter-class>\r
-  </filter>\r
-\r
-  <filter-mapping>\r
-    <filter-name>ShiroFilter</filter-name>\r
-    <url-pattern>/*</url-pattern>\r
-  </filter-mapping>\r
-\r
-  <filter>\r
-    <filter-name>cross-origin-restconf</filter-name>\r
-    <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>\r
-    <init-param>\r
-      <param-name>allowedOrigins</param-name>\r
-      <param-value>*</param-value>\r
-    </init-param>\r
-    <init-param>\r
-      <param-name>allowedMethods</param-name>\r
-      <param-value>GET,POST,OPTIONS,DELETE,PUT,HEAD</param-value>\r
-    </init-param>\r
-    <init-param>\r
-      <param-name>allowedHeaders</param-name>\r
-      <param-value>origin, content-type, accept, authorization</param-value>\r
-    </init-param>\r
-  </filter>\r
-  <filter-mapping>\r
-    <filter-name>cross-origin-restconf</filter-name>\r
-    <url-pattern>/*</url-pattern>\r
-  </filter-mapping>\r
-  <security-constraint>\r
-    <web-resource-collection>\r
-      <web-resource-name>NB api</web-resource-name>\r
-      <url-pattern>/*</url-pattern>\r
-      <http-method>POST</http-method>\r
-      <http-method>GET</http-method>\r
-      <http-method>PUT</http-method>\r
-      <http-method>PATCH</http-method>\r
-      <http-method>DELETE</http-method>\r
-      <http-method>HEAD</http-method>\r
-    </web-resource-collection>\r
-  </security-constraint>\r
-</web-app>\r
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+  <servlet>
+    <servlet-name>JAXRSNeutron</servlet-name>
+    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+    <init-param>
+      <param-name>javax.ws.rs.Application</param-name>
+      <param-value>org.opendaylight.neutron.northbound.api.NeutronNorthboundRSApplication</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>JAXRSNeutron</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+  <context-param>
+    <param-name>shiroEnvironmentClass</param-name>
+    <param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>
+  </context-param>
+
+  <listener>
+    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
+  </listener>
+
+  <filter>
+    <filter-name>ShiroFilter</filter-name>
+    <filter-class>org.opendaylight.aaa.shiro.filters.AAAShiroFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>ShiroFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>cross-origin-restconf</filter-name>
+    <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+    <init-param>
+      <param-name>allowedOrigins</param-name>
+      <param-value>*</param-value>
+    </init-param>
+    <init-param>
+      <param-name>allowedMethods</param-name>
+      <param-value>GET,POST,OPTIONS,DELETE,PUT,HEAD</param-value>
+    </init-param>
+    <init-param>
+      <param-name>allowedHeaders</param-name>
+      <param-value>origin, content-type, accept, authorization</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>cross-origin-restconf</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+</web-app>
index 17688f403539ae8ea0fc187203558f66bdae3f19..02ac1a44b366b7d4bfc358dafd6784510bd7bf96 100644 (file)
@@ -8,13 +8,13 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>project-neutron-parent</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>pom</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. -->
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 7c390373a44b888a35f680e56c114aa746661294..feda1e1afaf3e17512fa6b1d51da60f0a19e669b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,12 +9,12 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>parent</relativePath>
   </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>project-neutron</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>neutron</name> <!-- Used by Sonar to set project name -->
   <description>OpenDaylight Neutron Northbound Service</description>
index 1c329740873d6765e26ecb5a4a9675dabdbfd3d7..b9f272166b3010bb4cdb47d255cc66e83d56614a 100644 (file)
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>transcriber</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.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. -->
index 67eafbd237dd83339c36614f2afc85cb5b87e107..3bbcdb486c4d73fbfa4558dbf00d27f56f1e86f7 100644 (file)
@@ -43,7 +43,7 @@ public final class NeutronL2gatewayConnectionInterface
             result.setNetworkID(String.valueOf(l2gatewayConnection.getNetworkId().getValue()));
         }
         if (l2gatewayConnection.getSegmentId() != null) {
-            result.setSegmentID(Integer.valueOf(l2gatewayConnection.getSegmentId()));
+            result.setSegmentID(l2gatewayConnection.getSegmentId());
         }
         if (l2gatewayConnection.getPortId() != null) {
             result.setPortID(String.valueOf(l2gatewayConnection.getPortId().getValue()));
@@ -63,7 +63,7 @@ public final class NeutronL2gatewayConnectionInterface
             l2gatewayConnectionBuilder.setNetworkId(toUuid(neutronObject.getNetworkID()));
         }
         if (neutronObject.getSegmentID() != null) {
-            l2gatewayConnectionBuilder.setSegmentId((neutronObject.getSegmentID()));
+            l2gatewayConnectionBuilder.setSegmentId(neutronObject.getSegmentID());
         }
         if (neutronObject.getPortID() != null) {
             l2gatewayConnectionBuilder.setPortId(toUuid(neutronObject.getPortID()));
index bed0b6dea63484d04d24e718259f5d385007cf93..a8658dc3116eb7914f066bedf15c4a3f3803de79 100644 (file)
@@ -47,7 +47,7 @@ public final class NeutronL2gatewayInterface
                 final NeutronL2gatewayDevice neutronL2gatewayDevice = new NeutronL2gatewayDevice();
                 final List<NeutronL2gatewayDeviceInterface> neutronL2gatewayDeviceInterfaces = new ArrayList<>();
                 if (device.getDeviceName() != null) {
-                    neutronL2gatewayDevice.setDeviceName(device.getDeviceName().toString());
+                    neutronL2gatewayDevice.setDeviceName(device.getDeviceName());
                 }
                 if (device.getUuid() != null) {
                     neutronL2gatewayDevice.setID(device.getUuid().getValue());
@@ -59,7 +59,7 @@ public final class NeutronL2gatewayInterface
                         String interfaceName = null;
                         final List<Integer> segmentationIds = new ArrayList<>();
                         if (deviceInterface.getInterfaceName() != null) {
-                            interfaceName = deviceInterface.getInterfaceName().toString();
+                            interfaceName = deviceInterface.getInterfaceName();
                         }
                         if (deviceInterface.getSegmentationIds() != null) {
                             for (final Integer segmentId : deviceInterface.getSegmentationIds()) {
index 959e2cce4e8462453d71ecae4d3027fc7494ac7c..71f9f821674212036b6367d4b44558d60b01a28c 100644 (file)
@@ -63,7 +63,7 @@ public final class NeutronLoadBalancerHealthMonitorInterface
             healthmonitorBuilder.setHttpMethod(healthMonitor.getLoadBalancerHealthMonitorHttpMethod());
         }
         if (healthMonitor.getLoadBalancerHealthMonitorMaxRetries() != null) {
-            healthmonitorBuilder.setMaxRetries(Integer.valueOf(healthMonitor.getLoadBalancerHealthMonitorMaxRetries()));
+            healthmonitorBuilder.setMaxRetries(healthMonitor.getLoadBalancerHealthMonitorMaxRetries());
         }
         if (healthMonitor.getLoadBalancerHealthMonitorPools() != null) {
             final List<Uuid> listUuid = new ArrayList<>();
@@ -103,7 +103,7 @@ public final class NeutronLoadBalancerHealthMonitorInterface
             answer.setLoadBalancerHealthMonitorHttpMethod(healthMonitor.getHttpMethod());
         }
         if (healthMonitor.getMaxRetries() != null) {
-            answer.setLoadBalancerHealthMonitorMaxRetries(Integer.valueOf(healthMonitor.getMaxRetries()));
+            answer.setLoadBalancerHealthMonitorMaxRetries(healthMonitor.getMaxRetries());
         }
         if (healthMonitor.getPools() != null) {
             final List<NeutronID> list = new ArrayList<>();
index 4808007bbc9255149e2b6f1dbce2814362695da4..63d4d1ce280f13c67c67c03dd4ad2c2642539cea 100644 (file)
@@ -76,10 +76,10 @@ public final class NeutronSecurityRuleInterface extends
             answer.setSecurityRuleEthertype(ETHERTYPE_MAP.get(rule.getEthertype()));
         }
         if (rule.getPortRangeMin() != null) {
-            answer.setSecurityRulePortMin(Integer.valueOf(rule.getPortRangeMin()));
+            answer.setSecurityRulePortMin(rule.getPortRangeMin());
         }
         if (rule.getPortRangeMax() != null) {
-            answer.setSecurityRulePortMax(Integer.valueOf(rule.getPortRangeMax()));
+            answer.setSecurityRulePortMax(rule.getPortRangeMax());
         }
         return answer;
     }
@@ -119,10 +119,10 @@ public final class NeutronSecurityRuleInterface extends
                     .setEthertype(mapper.get(securityRule.getSecurityRuleEthertype()));
         }
         if (securityRule.getSecurityRulePortMin() != null) {
-            securityRuleBuilder.setPortRangeMin(Integer.valueOf(securityRule.getSecurityRulePortMin()));
+            securityRuleBuilder.setPortRangeMin(securityRule.getSecurityRulePortMin());
         }
         if (securityRule.getSecurityRulePortMax() != null) {
-            securityRuleBuilder.setPortRangeMax(Integer.valueOf(securityRule.getSecurityRulePortMax()));
+            securityRuleBuilder.setPortRangeMax(securityRule.getSecurityRulePortMax());
         }
         return securityRuleBuilder.build();
     }