Checkstyle formatting issues fix (SPI) 83/43883/2
authorRitu Sood <ritu.sood@intel.com>
Fri, 12 Aug 2016 01:03:57 +0000 (18:03 -0700)
committerRitu Sood <ritu.sood@intel.com>
Fri, 12 Aug 2016 05:25:36 +0000 (22:25 -0700)
Patch fixes WhitespaceAround, ArrayTypeStyle, OperatorWrap,
LineLength and other formatting checkstyle issues for
neutron-spi files.

Change-Id: Iafb65de2f544212e655d497d5e39a4bcb7f32b76
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
109 files changed:
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/INeutronPortCRUD.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.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/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/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/NeutronBgpvpn.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.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/NeutronL2gatewayDeviceInterface.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/NeutronLoadBalancer_SessionPersistence.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/NeutronNetwork_Segment.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/NeutronPort_AllowedAddressPairs.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronResourceMapPropertyAdapter.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRoute.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.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/NeutronSubnetIPAllocationPool.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetection.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/NeutronVPNLifetime.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java
neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/JaxbTestHelper.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIPJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetIPAllocationPoolTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetectionJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicyJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicyJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnectionJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNLifetimeJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNServiceJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java
neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java

index b3e91b7d1cc124de4a2bfeeea6b376395474caac..7ca5923642fa39aeae9823ef9447c3e6f64c27f8 100644 (file)
@@ -12,8 +12,7 @@ package org.opendaylight.neutron.spi;
  * This interface defines the methods for CRUD of NB OpenStack Firewall objects
  */
 
-public interface INeutronFirewallCRUD
-    extends INeutronCRUD<NeutronFirewall> {
+public interface INeutronFirewallCRUD extends INeutronCRUD<NeutronFirewall> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index c893ffbce2cf8ec87c32e98dfe89039c11bc7c4a..67a7bd4a07cc8dd79658149cbb9d18a622889af2 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronFirewallPolicyCRUD
-    extends INeutronCRUD<NeutronFirewallPolicy> {
+public interface INeutronFirewallPolicyCRUD extends INeutronCRUD<NeutronFirewallPolicy> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index a7aa525328a9bb277f9e855fd6769fa8231ab14c..9ed37f13073ac1f8ddc7b31007c8fa66ef561825 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronFirewallRuleCRUD
-    extends INeutronCRUD<NeutronFirewallRule> {
+public interface INeutronFirewallRuleCRUD extends INeutronCRUD<NeutronFirewallRule> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index c330e5ebd52e6455d560377f7ca553de63c8e3da..cec118858d7a1c107dc10aec574859c5d6c43a4f 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronFloatingIPCRUD
-    extends INeutronCRUD<NeutronFloatingIP> {
+public interface INeutronFloatingIPCRUD extends INeutronCRUD<NeutronFloatingIP> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 14b2b460a271968e4863d26cd29cd0fc256b1bad..09355e75741985b92dea4351b64e088ab8e79d29 100644 (file)
@@ -7,9 +7,10 @@
  */
 
 package org.opendaylight.neutron.spi;
+
 /**
  * This interface defines the methods for CRUD of NB OpenStack L2gateway objects
  */
-public interface INeutronL2gatewayCRUD extends INeutronCRUD<NeutronL2gateway>{
+public interface INeutronL2gatewayCRUD extends INeutronCRUD<NeutronL2gateway> {
     //Do nothing here.
 }
index 1c654c363a55647acba9bfb96c7f3fa367d2e3cd..bf357ecfd6a8c335dfb4a033436d5fb68ecd30f7 100644 (file)
@@ -7,6 +7,7 @@
  */
 
 package org.opendaylight.neutron.spi;
+
 /**
  * This interface defines the methods for CRUD of NB OpenStack L2gateway
  * Connection objects.
index 5a21db183d8cdf998e4537c8a63ff0842cac7537..141cb29f6dd528ad75bf686bc99769d2d54a4300 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronLoadBalancerCRUD
-    extends INeutronCRUD<NeutronLoadBalancer> {
+public interface INeutronLoadBalancerCRUD extends INeutronCRUD<NeutronLoadBalancer> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index a49bc2aaa45025b03c6b01f2b9783c2110c8b7a9..4169bc81acebfaa0dadadd96f11f71fae5f4abe8 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronLoadBalancerHealthMonitorCRUD
-    extends INeutronCRUD<NeutronLoadBalancerHealthMonitor> {
+public interface INeutronLoadBalancerHealthMonitorCRUD extends INeutronCRUD<NeutronLoadBalancerHealthMonitor> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 468100a30a2b258c9c51d887b788e533bc858928..984930924d4ecdb2d4f6cb93f5ce16e7dd36a575 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronLoadBalancerListenerCRUD
-    extends INeutronCRUD<NeutronLoadBalancerListener> {
+public interface INeutronLoadBalancerListenerCRUD extends INeutronCRUD<NeutronLoadBalancerListener> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index cfd4ccdc0bf29f023d041df5e6c271db0606fa05..9379145635f26d55f91eea42f6cbd4c69a81e2b0 100644 (file)
@@ -15,8 +15,7 @@ import java.util.List;
  *
  */
 
-public interface INeutronLoadBalancerPoolCRUD
-    extends INeutronCRUD<NeutronLoadBalancerPool> {
+public interface INeutronLoadBalancerPoolCRUD extends INeutronCRUD<NeutronLoadBalancerPool> {
     /**
      * Applications call this interface method to determine if a particular
      *NeutronLoadBalancerPoolMember object exists
index 3df1228af413525c7c03febc2a20ce2f40bc9fb1..a1512eab2639b9aafbc3b165543701fa6a99fb05 100644 (file)
@@ -8,8 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-public interface INeutronMeteringLabelCRUD
-    extends INeutronCRUD<NeutronMeteringLabel> {
+public interface INeutronMeteringLabelCRUD extends INeutronCRUD<NeutronMeteringLabel> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 26f67ae5d9330c7b2a1d36a1db348f787bd48532..bd16de602c5c402619ddb9dc4c666088d4416e62 100644 (file)
@@ -8,8 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-public interface INeutronMeteringLabelRuleCRUD
-    extends INeutronCRUD<NeutronMeteringLabelRule> {
+public interface INeutronMeteringLabelRuleCRUD extends INeutronCRUD<NeutronMeteringLabelRule> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index ec67ddd52cd5b14e49c7a1ce0a779a28cc888cc1..b7cdc9446a7abdb69fb0b2350c4a4a8137f576c7 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronNetworkCRUD
-    extends INeutronCRUD<NeutronNetwork> {
+public interface INeutronNetworkCRUD extends INeutronCRUD<NeutronNetwork> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index d8b17373565b3fcfeb3a870bc0f22958eb9e91cc..1886d63116367ef0b871ca40dadb0df24f0db732 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronPortCRUD
-    extends INeutronCRUD<NeutronPort> {
+public interface INeutronPortCRUD extends INeutronCRUD<NeutronPort> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 799e24ffe1cdfcbc5983935a8b83e5c9a527915b..f86104ce006038009830039e403bcb161e96d8bb 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronRouterCRUD
-    extends INeutronCRUD<NeutronRouter> {
+public interface INeutronRouterCRUD extends INeutronCRUD<NeutronRouter> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 2263c5c5604c97f2611e059835c2d7f261110db2..6b2ac8722b39d3447e521969b6a1609987ae4924 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.neutron.spi;
  * This interface defines the methods for CRUD of NB SFC Port Chain objects
  *
  */
-public interface INeutronSFCPortChainCRUD extends INeutronCRUD<NeutronSFCPortChain>{
+public interface INeutronSFCPortChainCRUD extends INeutronCRUD<NeutronSFCPortChain> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index ca965d981a15ba6b077480824d027b28e411ea08..a1c63a9385a6c59c8a3ac8380488101546361745 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.neutron.spi;
  * This interface defines the methods for CRUD of NB SFC Port Pair objects
  *
  */
-public interface INeutronSFCPortPairCRUD extends INeutronCRUD<NeutronSFCPortPair>  {
+public interface INeutronSFCPortPairCRUD extends INeutronCRUD<NeutronSFCPortPair> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 949efebd5eaf0b9029cfb05188346683a115b0b5..6209ad0ac6487214121673ca5f761c42d598ce70 100644 (file)
@@ -12,8 +12,7 @@ package org.opendaylight.neutron.spi;
  * This interface defines the methods for CRUD of NB OpenStack Security Group objects
  */
 
-public interface INeutronSecurityGroupCRUD
-    extends INeutronCRUD<NeutronSecurityGroup> {
+public interface INeutronSecurityGroupCRUD extends INeutronCRUD<NeutronSecurityGroup> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 3f275c9d99fa65eb88f5e645cf6fda4565dfcac5..12066e1dc3c0ef17237d35c24fd3e1f5a71aeb5d 100644 (file)
@@ -12,8 +12,7 @@ package org.opendaylight.neutron.spi;
  * This interface defines the methods for CRUD of NB OpenStack Security Rule objects
  */
 
-public interface INeutronSecurityRuleCRUD
-    extends INeutronCRUD<NeutronSecurityRule> {
+public interface INeutronSecurityRuleCRUD extends INeutronCRUD<NeutronSecurityRule> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index ee628ed34ccc0104a30715d3a5e32e37de2f469b..17e8e1672c38a084e7e529b490d7f079f689f45d 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronSubnetCRUD
-    extends INeutronCRUD<NeutronSubnet> {
+public interface INeutronSubnetCRUD extends INeutronCRUD<NeutronSubnet> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 6a7322fc67cf752105e0d708d3bf334c1f09185f..d3902252d0106c07a6795c1fc836eddd9dd64877 100644 (file)
@@ -8,8 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-public interface INeutronVPNIKEPolicyCRUD
-    extends INeutronCRUD<NeutronVPNIKEPolicy> {
+public interface INeutronVPNIKEPolicyCRUD extends INeutronCRUD<NeutronVPNIKEPolicy> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 78c48302e27d44f60666dbc861827c00c5cd4727..8cadf0be53ebf92010931241afda743041074b83 100644 (file)
@@ -8,8 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-public interface INeutronVPNIPSECPolicyCRUD
-    extends INeutronCRUD<NeutronVPNIPSECPolicy> {
+public interface INeutronVPNIPSECPolicyCRUD extends INeutronCRUD<NeutronVPNIPSECPolicy> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index f987c5a716cc1b4e00b39bfd6adb9010829b61f6..d34aea256c9de5081d32409b989717be8cf34719 100644 (file)
@@ -8,8 +8,7 @@
 
 package org.opendaylight.neutron.spi;
 
-public interface INeutronVPNIPSECSiteConnectionsCRUD
-    extends INeutronCRUD<NeutronVPNIPSECSiteConnection> {
+public interface INeutronVPNIPSECSiteConnectionsCRUD extends INeutronCRUD<NeutronVPNIPSECSiteConnection> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index e832d92d728f4dc1041ab150ce8f32bfa20bc708..064542da90bed3b868caa2145fd6e3c96bb88401 100644 (file)
@@ -13,8 +13,7 @@ package org.opendaylight.neutron.spi;
  *
  */
 
-public interface INeutronVPNServiceCRUD
-    extends INeutronCRUD<NeutronVPNService> {
+public interface INeutronVPNServiceCRUD extends INeutronCRUD<NeutronVPNService> {
     // Nothing Here.
     // This class is defined to use reflection.
 }
index 854b464d2f79c37f8347b3ce9080b63cebf7ef6d..b1fa1c0b0a298a3d26d6d5e9699c9063193dd530 100644 (file)
@@ -24,43 +24,43 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
 
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String bgpvpnName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (defaultValue = "l3", name = "type")
+    @XmlElement(defaultValue = "l3", name = "type")
     String type;
 
-    @XmlElement (name = "technique")
+    @XmlElement(name = "technique")
     String technique;
 
-    @XmlElement (name = "route_targets")
+    @XmlElement(name = "route_targets")
     List<String> routeTargets;
 
-    @XmlElement (name = "import_targets")
+    @XmlElement(name = "import_targets")
     List<String> importTargets;
 
-    @XmlElement (name = "export_targets")
+    @XmlElement(name = "export_targets")
     List<String> exportTargets;
 
-    @XmlElement (name = "route_distinguishers")
+    @XmlElement(name = "route_distinguishers")
     List<String> routeDistinguishers;
 
-    @XmlElement (name="vnid")
+    @XmlElement(name = "vnid")
     Long vnid;
 
-    @XmlElement (defaultValue="false", name="auto_aggregate")
+    @XmlElement(defaultValue = "false", name = "auto_aggregate")
     Boolean autoAggregate;
 
-    @XmlElement (name = "networks")
+    @XmlElement(name = "networks")
     List<String> networks;
 
-    @XmlElement (name = "routers")
+    @XmlElement(name = "routers")
     List<String> routers;
 
     /* This attribute lists the ports associated with an instance
@@ -97,7 +97,9 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(boolean newValue) {
         adminStateUp = newValue;
@@ -136,7 +138,7 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
     }
 
     public void setRouteTargets(List<String> routeTargets) {
-        this.routeTargets= routeTargets;
+        this.routeTargets = routeTargets;
     }
 
     public void addRouteTarget(String uuid) {
@@ -203,7 +205,9 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
         vnid = input;
     }
 
-    public Boolean getAutoAggregate() { return autoAggregate; }
+    public Boolean getAutoAggregate() {
+        return autoAggregate;
+    }
 
     public void setAutoAggregate(boolean newValue) {
         autoAggregate = newValue;
@@ -307,13 +311,10 @@ public class NeutronBgpvpn extends NeutronObject implements Serializable, INeutr
 
     @Override
     public String toString() {
-        return "NeutronBgpvpn [bgpvpnUUID=" + uuid + ", bgpvpnName=" + bgpvpnName + ", adminStateUp="
-                + adminStateUp + ", status=" + status + ", tenantID=" + tenantID + ", type=" + type
-                + ", technique=" + technique + ", routeTargets="
-                + routeTargets + ", importTargets=" + importTargets + ", exportTargets=" + exportTargets
-                + ", routeDistinguishers=" + routeDistinguishers + ", vnid = " + vnid
-                + ", autoAggregate = " + autoAggregate + ", networks = " + networks
-                + ", routers = " + routers + "]";
+        return "NeutronBgpvpn [bgpvpnUUID=" + uuid + ", bgpvpnName=" + bgpvpnName + ", adminStateUp=" + adminStateUp
+                + ", status=" + status + ", tenantID=" + tenantID + ", type=" + type + ", technique=" + technique
+                + ", routeTargets=" + routeTargets + ", importTargets=" + importTargets + ", exportTargets="
+                + exportTargets + ", routeDistinguishers=" + routeDistinguishers + ", vnid = " + vnid
+                + ", autoAggregate = " + autoAggregate + ", networks = " + networks + ", routers = " + routers + "]";
     }
 }
-
index fc1f8164b26f203775c8d053186a7b34e83645b7..26db8833f1215fe2f5bfc8f255f2a0934727fc7f 100644 (file)
@@ -15,8 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class NeutronCRUDInterfaces {
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(NeutronCRUDInterfaces.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NeutronCRUDInterfaces.class);
 
     private INeutronNetworkCRUD networkInterface;
     private INeutronSubnetCRUD subnetInterface;
@@ -232,7 +231,8 @@ public class NeutronCRUDInterfaces {
     }
 
     public NeutronCRUDInterfaces fetchINeutronLoadBalancerHealthMonitorCRUD(Object obj) {
-        lbhmInterface = (INeutronLoadBalancerHealthMonitorCRUD) getInstances(INeutronLoadBalancerHealthMonitorCRUD.class, obj);
+        lbhmInterface = (INeutronLoadBalancerHealthMonitorCRUD) getInstances(
+                INeutronLoadBalancerHealthMonitorCRUD.class, obj);
         return this;
     }
 
@@ -262,7 +262,8 @@ public class NeutronCRUDInterfaces {
     }
 
     public NeutronCRUDInterfaces fetchINeutronVPNIPSECSiteConnectionsCRUD(Object obj) {
-        ipsecScInterface = (INeutronVPNIPSECSiteConnectionsCRUD) getInstances(INeutronVPNIPSECSiteConnectionsCRUD.class, obj);
+        ipsecScInterface = (INeutronVPNIPSECSiteConnectionsCRUD) getInstances(INeutronVPNIPSECSiteConnectionsCRUD.class,
+                obj);
         return this;
     }
 
@@ -277,31 +278,30 @@ public class NeutronCRUDInterfaces {
     }
 
     public NeutronCRUDInterfaces fetchINeutronL2gatewayConnectionCRUD(Object obj) {
-        l2gatewayConnectionInterface = (INeutronL2gatewayConnectionCRUD) getInstances(INeutronL2gatewayConnectionCRUD.class, obj);
+        l2gatewayConnectionInterface = (INeutronL2gatewayConnectionCRUD) getInstances(
+                INeutronL2gatewayConnectionCRUD.class, obj);
         return this;
     }
 
-    public NeutronCRUDInterfaces fetchINeutronSFCFlowClassifierCRUD (Object obj) {
-        sfcFlowClassifierInterface =
-                (INeutronSFCFlowClassifierCRUD) getInstances(INeutronSFCFlowClassifierCRUD.class, obj);
+    public NeutronCRUDInterfaces fetchINeutronSFCFlowClassifierCRUD(Object obj) {
+        sfcFlowClassifierInterface = (INeutronSFCFlowClassifierCRUD) getInstances(INeutronSFCFlowClassifierCRUD.class,
+                obj);
         return this;
     }
 
-    public NeutronCRUDInterfaces fetchINeutronSFCPortPairCRUD (Object obj) {
-        sfcPortPairInterface =
-                (INeutronSFCPortPairCRUD) getInstances(INeutronSFCPortPairCRUD.class, obj);
+    public NeutronCRUDInterfaces fetchINeutronSFCPortPairCRUD(Object obj) {
+        sfcPortPairInterface = (INeutronSFCPortPairCRUD) getInstances(INeutronSFCPortPairCRUD.class, obj);
         return this;
     }
 
-    public NeutronCRUDInterfaces fetchINeutronSFCPortPairGroupCRUD (Object obj) {
-        sfcPortPairGroupInterface =
-                (INeutronSFCPortPairGroupCRUD) getInstances(INeutronSFCPortPairGroupCRUD.class, obj);
+    public NeutronCRUDInterfaces fetchINeutronSFCPortPairGroupCRUD(Object obj) {
+        sfcPortPairGroupInterface = (INeutronSFCPortPairGroupCRUD) getInstances(INeutronSFCPortPairGroupCRUD.class,
+                obj);
         return this;
     }
 
-    public NeutronCRUDInterfaces fetchINeutronSFCPortChainCRUD (Object obj) {
-        sfcPortChainInterface =
-                (INeutronSFCPortChainCRUD) getInstances(INeutronSFCPortChainCRUD.class, obj);
+    public NeutronCRUDInterfaces fetchINeutronSFCPortChainCRUD(Object obj) {
+        sfcPortChainInterface = (INeutronSFCPortChainCRUD) getInstances(INeutronSFCPortChainCRUD.class, obj);
         return this;
     }
 
index 655b6950acc1a2d8dfe8da0a7e206a6f97ba6693..5c795da431a2ea8d5e7e26e5625e1b202bc4fd8d 100644 (file)
@@ -38,16 +38,16 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronFirewall extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String firewallName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean firewallAdminStateIsUp;
 
-    @XmlElement (defaultValue = "false", name = "shared")
+    @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallIsShared;
 
-    @XmlElement (name = "firewall_policy_id")
+    @XmlElement(name = "firewall_policy_id")
     String neutronFirewallPolicyID;
 
     public String getFirewallName() {
@@ -111,13 +111,8 @@ public class NeutronFirewall extends NeutronObject implements Serializable, INeu
 
     @Override
     public String toString() {
-        return "NeutronFirewall{" +
-            "firewallUUID='" + uuid + '\'' +
-            ", firewallTenantID='" + tenantID + '\'' +
-            ", firewallName='" + firewallName + '\'' +
-            ", firewallAdminStateIsUp=" + firewallAdminStateIsUp +
-            ", firewallIsShared=" + firewallIsShared +
-            ", firewallRulePolicyID=" + neutronFirewallPolicyID +
-            '}';
+        return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + tenantID + '\''
+                + ", firewallName='" + firewallName + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
+                + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + neutronFirewallPolicyID + '}';
     }
 }
index 1af3de3ad3280793fc57eadb908e1fccf28b7a5a..8a5beaa451bcd4998cca711368f5c7bdc4ee5f22 100644 (file)
@@ -37,13 +37,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronFirewallPolicy extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String firewallPolicyName;
 
-    @XmlElement (defaultValue = "false", name = "shared")
+    @XmlElement(defaultValue = "false", name = "shared")
     Boolean firewallPolicyIsShared;
 
-    @XmlElement (defaultValue = "false", name = "audited")
+    @XmlElement(defaultValue = "false", name = "audited")
     Boolean firewallPolicyIsAudited;
 
     public Boolean getFirewallPolicyIsAudited() {
@@ -96,12 +96,8 @@ public class NeutronFirewallPolicy extends NeutronObject implements Serializable
 
     @Override
     public String toString() {
-        return "NeutronFirewallPolicy{" +
-            "firewallPolicyUUID='" + uuid + '\'' +
-            ", firewallPolicyTenantID='" + tenantID + '\'' +
-            ", firewallPolicyName='" + firewallPolicyName + '\'' +
-            ", firewallPolicyIsShared=" + firewallPolicyIsShared +
-            ", firewallPolicyIsAudited='" + firewallPolicyIsAudited + '\'' +
-            '}';
+        return "NeutronFirewallPolicy{" + "firewallPolicyUUID='" + uuid + '\'' + ", firewallPolicyTenantID='" + tenantID
+                + '\'' + ", firewallPolicyName='" + firewallPolicyName + '\'' + ", firewallPolicyIsShared="
+                + firewallPolicyIsShared + ", firewallPolicyIsAudited='" + firewallPolicyIsAudited + '\'' + '}';
     }
 }
index e90467533bfe0842d41a03b46bb68e288379fee8..645db26d0602cd427c9b1eda698c7284ebeeeb14 100644 (file)
@@ -260,22 +260,15 @@ public class NeutronFirewallRule extends NeutronObject implements Serializable,
 
     @Override
     public String toString() {
-        return "firewallPolicyRules{" +
-            "firewallRuleUUID='" + uuid + '\'' +
-            ", firewallRuleTenantID='" + tenantID + '\'' +
-            ", firewallRuleName='" + firewallRuleName + '\'' +
-            ", firewallRuleIsShared=" + firewallRuleIsShared +
-            ", firewallRulePolicyID=" + firewallRulePolicyID +
-            ", firewallRuleProtocol='" + firewallRuleProtocol + '\'' +
-            ", firewallRuleIpVer=" + firewallRuleIpVer +
-            ", firewallRuleSrcIpAddr='" + firewallRuleSrcIpAddr + '\'' +
-            ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\'' +
-            ", firewallRuleSrcPort=" + firewallRuleSrcPortRangeMin + ':' + firewallRuleSrcPortRangeMax +
-            ", firewallRuleDstPort=" + firewallRuleDstPortRangeMin + ':' + firewallRuleDstPortRangeMax +
-            ", firewallRulePosition=" + firewallRulePosition +
-            ", firewallRuleAction='" + firewallRuleAction + '\'' +
-            ", firewallRuleIsEnabled=" + firewallRuleIsEnabled +
-            '}';
+        return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + tenantID
+                + '\'' + ", firewallRuleName='" + firewallRuleName + '\'' + ", firewallRuleIsShared="
+                + firewallRuleIsShared + ", firewallRulePolicyID=" + firewallRulePolicyID + ", firewallRuleProtocol='"
+                + firewallRuleProtocol + '\'' + ", firewallRuleIpVer=" + firewallRuleIpVer + ", firewallRuleSrcIpAddr='"
+                + firewallRuleSrcIpAddr + '\'' + ", firewallRuleDstIpAddr='" + firewallRuleDstIpAddr + '\''
+                + ", firewallRuleSrcPort=" + firewallRuleSrcPortRangeMin + ':' + firewallRuleSrcPortRangeMax
+                + ", firewallRuleDstPort=" + firewallRuleDstPortRangeMin + ':' + firewallRuleDstPortRangeMax
+                + ", firewallRulePosition=" + firewallRulePosition + ", firewallRuleAction='" + firewallRuleAction
+                + '\'' + ", firewallRuleIsEnabled=" + firewallRuleIsEnabled + '}';
     }
 
     @Override
index 1d7a849b6c149b0596466cd286e680f4aca4a94c..9cfa83e8b7139795617d86ec5f48a774354e0885 100644 (file)
@@ -25,22 +25,22 @@ public class NeutronFloatingIP extends NeutronObject implements Serializable, IN
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "floating_network_id")
+    @XmlElement(name = "floating_network_id")
     String floatingNetworkUUID;
 
-    @XmlElement (name = "port_id")
+    @XmlElement(name = "port_id")
     String portUUID;
 
-    @XmlElement (name = "fixed_ip_address")
+    @XmlElement(name = "fixed_ip_address")
     String fixedIPAddress;
 
-    @XmlElement (name = "floating_ip_address")
+    @XmlElement(name = "floating_ip_address")
     String floatingIPAddress;
 
-    @XmlElement (name="router_id")
+    @XmlElement(name = "router_id")
     String routerUUID;
 
-    @XmlElement (name="status")
+    @XmlElement(name = "status")
     String status;
 
     public NeutronFloatingIP() {
@@ -139,15 +139,9 @@ public class NeutronFloatingIP extends NeutronObject implements Serializable, IN
 
     @Override
     public String toString() {
-        return "NeutronFloatingIP{" +
-            "fipUUID='" + uuid + '\'' +
-            ", fipFloatingNetworkId='" + floatingNetworkUUID + '\'' +
-            ", fipPortUUID='" + portUUID + '\'' +
-            ", fipFixedIPAddress='" + fixedIPAddress + '\'' +
-            ", fipFloatingIPAddress=" + floatingIPAddress +
-            ", fipTenantId='" + tenantID + '\'' +
-            ", fipRouterId='" + routerUUID + '\'' +
-            ", fipStatus='" + status + '\'' +
-            '}';
+        return "NeutronFloatingIP{" + "fipUUID='" + uuid + '\'' + ", fipFloatingNetworkId='" + floatingNetworkUUID
+                + '\'' + ", fipPortUUID='" + portUUID + '\'' + ", fipFixedIPAddress='" + fixedIPAddress + '\''
+                + ", fipFloatingIPAddress=" + floatingIPAddress + ", fipTenantId='" + tenantID + '\''
+                + ", fipRouterId='" + routerUUID + '\'' + ", fipStatus='" + status + '\'' + '}';
     }
 }
index 6770e06ed42cce69d3b758b684646c23085defc5..d1ca0596595e0352f44d017614dfbc8f5a6570d4 100644 (file)
@@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "l2gateway")
-public class NeutronL2gateway extends NeutronObject implements Serializable, INeutronObject{
+public class NeutronL2gateway extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "name")
@@ -66,12 +66,8 @@ public class NeutronL2gateway extends NeutronObject implements Serializable, INe
 
     @Override
     public String toString() {
-        return "NeutronL2Gateway [" +
-                "id = " + uuid +
-                ", name = " + l2gatewayName +
-                ", tenant_id = " + tenantID +
-                ", devices = " + neutronL2gatewayDevices +
-                "]";
+        return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + l2gatewayName + ", tenant_id = " + tenantID
+                + ", devices = " + neutronL2gatewayDevices + "]";
     }
 
 }
\ No newline at end of file
index b79f98d511d645ebed9b34c0dda109c21d30a1de..148ac07471d3e35af132f9efcb8760111acdc37a 100644 (file)
@@ -95,14 +95,9 @@ public class NeutronL2gatewayConnection extends NeutronObject implements Seriali
 
     @Override
     public String toString() {
-        return "NeutronL2GatewayConnection [" +
-                "tenant_id = " + tenantID +
-                ", connection_id = " + uuid +
-                ", gateway_id = " + l2gatewayID +
-                ", network_id = " + networkID +
-                ", segmentation_id = " + segmentID +
-                ", port_id = " + portID +
-                "]";
+        return "NeutronL2GatewayConnection [" + "tenant_id = " + tenantID + ", connection_id = " + uuid
+                + ", gateway_id = " + l2gatewayID + ", network_id = " + networkID + ", segmentation_id = " + segmentID
+                + ", port_id = " + portID + "]";
     }
 
 }
index 166f10a740aed7b2c425788dc1603c18925d1aad..fc2b1334b2ae5acb372c62a774ba43a99a048ea2 100644 (file)
@@ -35,15 +35,13 @@ public class NeutronL2gatewayDevice extends Neutron_ID implements Serializable {
     }
 
     public void setNeutronL2gatewayDeviceInterfaces(
-                    List<NeutronL2gatewayDeviceInterface> neutronL2gatewayDeviceInterfaces) {
+            List<NeutronL2gatewayDeviceInterface> neutronL2gatewayDeviceInterfaces) {
         this.neutronL2gatewayDeviceInterfaces = neutronL2gatewayDeviceInterfaces;
     }
+
     @Override
     public String toString() {
-        return "NeutronL2gatewayDevice ["
-                + "id=" + uuid
-                + ", neutronL2gwDeviceInterfaces="
-                + neutronL2gatewayDeviceInterfaces + ", deviceName=" + deviceName
-                + "]";
+        return "NeutronL2gatewayDevice [" + "id=" + uuid + ", neutronL2gwDeviceInterfaces="
+                + neutronL2gatewayDeviceInterfaces + ", deviceName=" + deviceName + "]";
     }
 }
index 27998505f669f51c4132047a735da3bcf82675f3..6931536207fc67afd7f48cb0e0fb4b8350af7419 100644 (file)
@@ -40,7 +40,7 @@ public class NeutronL2gatewayDeviceInterface implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronL2gatewayDeviceInterface [interfaceNames=" + interfaceName
-                + ", segmentationId=" + segmentationId + "]";
+        return "NeutronL2gatewayDeviceInterface [interfaceNames=" + interfaceName + ", segmentationId=" + segmentationId
+                + "]";
     }
 }
index 6b5629c2f0838b598dd483d6e719b9d5f25f37fe..3e8795f992a09e865dcd1a244fc858704ee91614 100644 (file)
@@ -37,19 +37,19 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronLoadBalancer extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String loadBalancerName;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String loadBalancerStatus;
 
-    @XmlElement (name = "admin_state_up")
+    @XmlElement(name = "admin_state_up")
     Boolean loadBalancerAdminStateUp;
 
-    @XmlElement (name = "vip_address")
+    @XmlElement(name = "vip_address")
     String loadBalancerVipAddress;
 
-    @XmlElement (name = "vip_subnet_id")
+    @XmlElement(name = "vip_subnet_id")
     String loadBalancerVipSubnetID;
 
     public String getLoadBalancerName() {
@@ -122,15 +122,11 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
         return ans;
     }
 
-    @Override public String toString() {
-        return "NeutronLoadBalancer{" +
-                "loadBalancerID='" + uuid + '\'' +
-                ", loadBalancerTenantID='" + tenantID + '\'' +
-                ", loadBalancerName='" + loadBalancerName + '\'' +
-                ", loadBalancerStatus='" + loadBalancerStatus + '\'' +
-                ", loadBalancerAdminStateUp='" + loadBalancerAdminStateUp + '\'' +
-                ", loadBalancerVipAddress='" + loadBalancerVipAddress + '\'' +
-                ", loadBalancerVipSubnetID='" + loadBalancerVipSubnetID + '\'' +
-                '}';
+    @Override
+    public String toString() {
+        return "NeutronLoadBalancer{" + "loadBalancerID='" + uuid + '\'' + ", loadBalancerTenantID='" + tenantID + '\''
+                + ", loadBalancerName='" + loadBalancerName + '\'' + ", loadBalancerStatus='" + loadBalancerStatus
+                + '\'' + ", loadBalancerAdminStateUp='" + loadBalancerAdminStateUp + '\'' + ", loadBalancerVipAddress='"
+                + loadBalancerVipAddress + '\'' + ", loadBalancerVipSubnetID='" + loadBalancerVipSubnetID + '\'' + '}';
     }
 }
index 974ca5a3f6b193ebdc77f035d7bee47141dfcf71..336a6bcb66c54ae9457796bf4e8fe9b53cd4b051 100644 (file)
@@ -40,36 +40,34 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 
-public class NeutronLoadBalancerHealthMonitor
-    extends NeutronObject
-    implements Serializable, INeutronObject {
+public class NeutronLoadBalancerHealthMonitor extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "type")
+    @XmlElement(name = "type")
     String loadBalancerHealthMonitorType;
 
-    @XmlElement (name = "delay")
+    @XmlElement(name = "delay")
     Integer loadBalancerHealthMonitorDelay;
 
-    @XmlElement (name = "timeout")
+    @XmlElement(name = "timeout")
     Integer loadBalancerHealthMonitorTimeout;
 
-    @XmlElement (name = "max_retries")
+    @XmlElement(name = "max_retries")
     Integer loadBalancerHealthMonitorMaxRetries;
 
-    @XmlElement (name = "http_method")
+    @XmlElement(name = "http_method")
     String loadBalancerHealthMonitorHttpMethod;
 
-    @XmlElement (name = "url_path")
+    @XmlElement(name = "url_path")
     String loadBalancerHealthMonitorUrlPath;
 
-    @XmlElement (name = "expected_codes")
+    @XmlElement(name = "expected_codes")
     String loadBalancerHealthMonitorExpectedCodes;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerHealthMonitorAdminStateIsUp;
 
-    @XmlElement (name = "pools")
+    @XmlElement(name = "pools")
     List<Neutron_ID> loadBalancerHealthMonitorPools;
 
     public String getLoadBalancerHealthMonitorType() {
@@ -170,7 +168,7 @@ public class NeutronLoadBalancerHealthMonitor
             if (s.equals("http_method")) {
                 ans.setLoadBalancerHealthMonitorHttpMethod(this.getLoadBalancerHealthMonitorHttpMethod());
             }
-            if(s.equals("url_path")) {
+            if (s.equals("url_path")) {
                 ans.setLoadBalancerHealthMonitorUrlPath(this.getLoadBalancerHealthMonitorUrlPath());
             }
             if (s.equals("expected_codes")) {
@@ -183,18 +181,17 @@ public class NeutronLoadBalancerHealthMonitor
         return ans;
     }
 
-    @Override public String toString() {
-        return "NeutronLoadBalancerHealthMonitor{" +
-                "loadBalancerHealthMonitorID='" + uuid + '\'' +
-                ", loadBalancerHealthMonitorTenantID='" + tenantID + '\'' +
-                ", loadBalancerHealthMonitorType='" + loadBalancerHealthMonitorType + '\'' +
-                ", loadBalancerHealthMonitorDelay=" + loadBalancerHealthMonitorDelay +
-                ", loadBalancerHealthMonitorTimeout=" + loadBalancerHealthMonitorTimeout +
-                ", loadBalancerHealthMonitorMaxRetries=" + loadBalancerHealthMonitorMaxRetries +
-                ", loadBalancerHealthMonitorHttpMethod='" + loadBalancerHealthMonitorHttpMethod + '\'' +
-                ", loadBalancerHealthMonitorUrlPath='" + loadBalancerHealthMonitorUrlPath + '\'' +
-                ", loadBalancerHealthMonitorExpectedCodes='" + loadBalancerHealthMonitorExpectedCodes + '\'' +
-                ", loadBalancerHealthMonitorAdminStateIsUp=" + loadBalancerHealthMonitorAdminStateIsUp +
-                '}';
+    @Override
+    public String toString() {
+        return "NeutronLoadBalancerHealthMonitor{" + "loadBalancerHealthMonitorID='" + uuid + '\''
+                + ", loadBalancerHealthMonitorTenantID='" + tenantID + '\'' + ", loadBalancerHealthMonitorType='"
+                + loadBalancerHealthMonitorType + '\'' + ", loadBalancerHealthMonitorDelay="
+                + loadBalancerHealthMonitorDelay + ", loadBalancerHealthMonitorTimeout="
+                + loadBalancerHealthMonitorTimeout + ", loadBalancerHealthMonitorMaxRetries="
+                + loadBalancerHealthMonitorMaxRetries + ", loadBalancerHealthMonitorHttpMethod='"
+                + loadBalancerHealthMonitorHttpMethod + '\'' + ", loadBalancerHealthMonitorUrlPath='"
+                + loadBalancerHealthMonitorUrlPath + '\'' + ", loadBalancerHealthMonitorExpectedCodes='"
+                + loadBalancerHealthMonitorExpectedCodes + '\'' + ", loadBalancerHealthMonitorAdminStateIsUp="
+                + loadBalancerHealthMonitorAdminStateIsUp + '}';
     }
 }
index ee3f417c92d62822e69daf08cb9e12ff2620832a..5383a14426606bc624f652f5e806ba8a3ace6c05 100644 (file)
@@ -39,30 +39,28 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 
-public class NeutronLoadBalancerListener
-    extends NeutronObject
-    implements Serializable, INeutronObject {
+public class NeutronLoadBalancerListener extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "default_pool_id")
+    @XmlElement(name = "default_pool_id")
     String neutronLoadBalancerListenerDefaultPoolID;
 
-    @XmlElement (name = "connection_limit")
+    @XmlElement(name = "connection_limit")
     Integer neutronLoadBalancerListenerConnectionLimit;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String loadBalancerListenerName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerListenerAdminStateIsUp;
 
-    @XmlElement (name = "protocol")
+    @XmlElement(name = "protocol")
     String neutronLoadBalancerListenerProtocol;
 
-    @XmlElement (name = "protocol_port")
+    @XmlElement(name = "protocol_port")
     String neutronLoadBalancerListenerProtocolPort;
 
-    @XmlElement (name = "load_balancers")
+    @XmlElement(name = "load_balancers")
     List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
 
     public String getLoadBalancerListenerName() {
@@ -117,7 +115,8 @@ public class NeutronLoadBalancerListener
         return neutronLoadBalancerListenerLoadBalancerIDs;
     }
 
-    public void setNeutronLoadBalancerListenerLoadBalancerIDs(List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs) {
+    public void setNeutronLoadBalancerListenerLoadBalancerIDs(
+            List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs) {
         this.neutronLoadBalancerListenerLoadBalancerIDs = neutronLoadBalancerListenerLoadBalancerIDs;
     }
 
@@ -129,7 +128,7 @@ public class NeutronLoadBalancerListener
             if (s.equals("id")) {
                 ans.setID(this.getID());
             }
-            if(s.equals("default_pool_id")) {
+            if (s.equals("default_pool_id")) {
                 ans.setNeutronLoadBalancerListenerDefaultPoolID(this.getNeutronLoadBalancerListenerDefaultPoolID());
             }
             if (s.equals("tenant_id")) {
@@ -151,16 +150,15 @@ public class NeutronLoadBalancerListener
         return ans;
     }
 
-    @Override public String toString() {
-        return "NeutronLoadBalancerListener{" +
-                "loadBalancerListenerID='" + uuid + '\'' +
-                ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\'' +
-                ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\'' +
-                ", loadBalancerListenerTenantID='" + tenantID + '\'' +
-                ", loadBalancerListenerName='" + loadBalancerListenerName + '\'' +
-                ", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp +
-                ", neutronLoadBalancerListenerProtocol='" + neutronLoadBalancerListenerProtocol + '\'' +
-                ", neutronLoadBalancerListenerProtocolPort='" + neutronLoadBalancerListenerProtocolPort + '\'' +
-                '}';
+    @Override
+    public String toString() {
+        return "NeutronLoadBalancerListener{" + "loadBalancerListenerID='" + uuid + '\''
+                + ", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\''
+                + ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\''
+                + ", loadBalancerListenerTenantID='" + tenantID + '\'' + ", loadBalancerListenerName='"
+                + loadBalancerListenerName + '\'' + ", loadBalancerListenerAdminStateIsUp="
+                + loadBalancerListenerAdminStateIsUp + ", neutronLoadBalancerListenerProtocol='"
+                + neutronLoadBalancerListenerProtocol + '\'' + ", neutronLoadBalancerListenerProtocolPort='"
+                + neutronLoadBalancerListenerProtocolPort + '\'' + '}';
     }
 }
index 5daec0aa8951f60dd674e6fbb758abff753f2045..9acc69ee9fd9f8714e96ce30cb04ccd29a6e63a8 100644 (file)
@@ -40,19 +40,19 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronLoadBalancerPool extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String loadBalancerPoolName;
 
-    @XmlElement (name = "protocol")
+    @XmlElement(name = "protocol")
     String loadBalancerPoolProtocol;
 
-    @XmlElement (name = "lb_algorithm")
+    @XmlElement(name = "lb_algorithm")
     String loadBalancerPoolLbAlgorithm;
 
-    @XmlElement (name = "healthmonitor_id")
+    @XmlElement(name = "healthmonitor_id")
     String neutronLoadBalancerPoolHealthMonitorID;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerPoolAdminStateIsUp;
 
     @XmlElement(name = "listeners")
@@ -65,7 +65,7 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
     List<NeutronLoadBalancerPoolMember> loadBalancerPoolMembers;
 
     public NeutronLoadBalancerPool() {
-        loadBalancerPoolMembers = new ArrayList<NeutronLoadBalancerPoolMember>();
+        loadBalancerPoolMembers = new ArrayList<>();
     }
 
     public String getLoadBalancerPoolName() {
@@ -112,7 +112,8 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
         return loadBalancerPoolSessionPersistence;
     }
 
-    public void setLoadBalancerSessionPersistence(NeutronLoadBalancer_SessionPersistence loadBalancerPoolSessionPersistence) {
+    public void setLoadBalancerSessionPersistence(
+            NeutronLoadBalancer_SessionPersistence loadBalancerPoolSessionPersistence) {
         this.loadBalancerPoolSessionPersistence = loadBalancerPoolSessionPersistence;
     }
 
@@ -128,9 +129,9 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
         /*
          * Update the pool_id of the member to that this.id
          */
-        List<NeutronLoadBalancerPoolMember> answer = new ArrayList<NeutronLoadBalancerPoolMember>();
+        List<NeutronLoadBalancerPoolMember> answer = new ArrayList<>();
         if (loadBalancerPoolMembers != null) {
-            for (NeutronLoadBalancerPoolMember member: loadBalancerPoolMembers) {
+            for (NeutronLoadBalancerPoolMember member : loadBalancerPoolMembers) {
                 member.setPoolID(uuid);
                 answer.add(member);
             }
@@ -139,7 +140,7 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
     }
 
     public NeutronLoadBalancerPoolMember getNeutronLoadBalancerPoolMember(String uuid) {
-        for (NeutronLoadBalancerPoolMember member: loadBalancerPoolMembers) {
+        for (NeutronLoadBalancerPoolMember member : loadBalancerPoolMembers) {
             if (uuid.equals(member.getID())) {
                 return member;
             }
@@ -161,7 +162,7 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
 
     public NeutronLoadBalancerPool extractFields(List<String> fields) {
         NeutronLoadBalancerPool ans = new NeutronLoadBalancerPool();
-        for (String s: fields) {
+        for (String s : fields) {
             if (s.equals("id")) {
                 ans.setID(this.getID());
             }
@@ -171,7 +172,7 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
             if (s.equals("name")) {
                 ans.setLoadBalancerPoolName(this.getLoadBalancerPoolName());
             }
-            if(s.equals("protocol")) {
+            if (s.equals("protocol")) {
                 ans.setLoadBalancerPoolProtocol(this.getLoadBalancerPoolProtocol());
             }
             if (s.equals("lb_algorithm")) {
@@ -192,16 +193,11 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
 
     @Override
     public String toString() {
-        return "NeutronLoadBalancerPool{" +
-            "id='" + uuid + '\'' +
-            ", tenantID='" + tenantID + '\'' +
-            ", name='" + loadBalancerPoolName + '\'' +
-            ", protocol=" + loadBalancerPoolProtocol +'\''+
-            ", lbAlgorithm='" + loadBalancerPoolLbAlgorithm + '\'' +
-            ", healthmonitorID=" + neutronLoadBalancerPoolHealthMonitorID +
-            ", adminStateUp=" + loadBalancerPoolAdminStateIsUp +
-// todo: add loadBalancerPoolMembers as joined string
-            '}';
+        return "NeutronLoadBalancerPool{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
+                + loadBalancerPoolName + '\'' + ", protocol=" + loadBalancerPoolProtocol + '\'' + ", lbAlgorithm='"
+                + loadBalancerPoolLbAlgorithm + '\'' + ", healthmonitorID=" + neutronLoadBalancerPoolHealthMonitorID
+                + ", adminStateUp=" + loadBalancerPoolAdminStateIsUp + '}';
+     // todo: add loadBalancerPoolMembers as joined string
     }
 
 }
index 37e0ca3694af4ab20052256462ab01a742cc84f8..893b65637a3643eee0e0ce4361e9f0d216ddf239 100644 (file)
@@ -20,28 +20,26 @@ import javax.xml.bind.annotation.XmlTransient;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 
-public class NeutronLoadBalancerPoolMember
-    extends NeutronObject
-    implements Serializable, INeutronObject {
+public class NeutronLoadBalancerPoolMember extends NeutronObject implements Serializable, INeutronObject {
 
     private static final long serialVersionUID = 1L;
 
     /**
      * TODO: Plumb into LBaaS Pool. Members are nested underneath Pool CRUD.
      */
-    @XmlElement (name = "address")
+    @XmlElement(name = "address")
     String poolMemberAddress;
 
-    @XmlElement (name = "protocol_port")
+    @XmlElement(name = "protocol_port")
     Integer poolMemberProtoPort;
 
-    @XmlElement (name = "admin_state_up")
+    @XmlElement(name = "admin_state_up")
     Boolean poolMemberAdminStateIsUp;
 
-    @XmlElement (name = "weight")
+    @XmlElement(name = "weight")
     Integer poolMemberWeight;
 
-    @XmlElement (name = "subnet_id")
+    @XmlElement(name = "subnet_id")
     String poolMemberSubnetID;
 
     String poolID;
@@ -115,31 +113,28 @@ public class NeutronLoadBalancerPoolMember
             if (s.equals("address")) {
                 ans.setPoolMemberAddress(this.getPoolMemberAddress());
             }
-            if(s.equals("protocol_port")) {
+            if (s.equals("protocol_port")) {
                 ans.setPoolMemberProtoPort(this.getPoolMemberProtoPort());
             }
             if (s.equals("admin_state_up")) {
                 ans.setPoolMemberAdminStateIsUp(poolMemberAdminStateIsUp);
             }
-            if(s.equals("weight")) {
+            if (s.equals("weight")) {
                 ans.setPoolMemberWeight(this.getPoolMemberWeight());
             }
-            if(s.equals("subnet_id")) {
+            if (s.equals("subnet_id")) {
                 ans.setPoolMemberSubnetID(this.getPoolMemberSubnetID());
             }
         }
         return ans;
     }
-    @Override public String toString() {
-        return "NeutronLoadBalancerPoolMember{" +
-                "poolMemberID='" + uuid + '\'' +
-                ", poolID='" + poolID + '\'' +
-                ", poolMemberTenantID='" + tenantID + '\'' +
-                ", poolMemberAddress='" + poolMemberAddress + '\'' +
-                ", poolMemberProtoPort=" + poolMemberProtoPort +
-                ", poolMemberAdminStateIsUp=" + poolMemberAdminStateIsUp +
-                ", poolMemberWeight=" + poolMemberWeight +
-                ", poolMemberSubnetID='" + poolMemberSubnetID + '\'' +
-                '}';
+
+    @Override
+    public String toString() {
+        return "NeutronLoadBalancerPoolMember{" + "poolMemberID='" + uuid + '\'' + ", poolID='" + poolID + '\''
+                + ", poolMemberTenantID='" + tenantID + '\'' + ", poolMemberAddress='" + poolMemberAddress + '\''
+                + ", poolMemberProtoPort=" + poolMemberProtoPort + ", poolMemberAdminStateIsUp="
+                + poolMemberAdminStateIsUp + ", poolMemberWeight=" + poolMemberWeight + ", poolMemberSubnetID='"
+                + poolMemberSubnetID + '\'' + '}';
     }
 }
index cd7ea5ffc7d5e46c067628efd73f82bf467ed246..c42fc44f3470d8843372a16929f9344c0864f4a6 100644 (file)
@@ -52,4 +52,3 @@ public class NeutronLoadBalancer_SessionPersistence implements Serializable {
         this.type = type;
     }
 }
-
index 18e51f2306adc7b68254e6040461f01a72cb430e..726c3ffc2e26e317e71307a4f9541d71bfe5f4ae 100644 (file)
@@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronMeteringLabel extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String meteringLabelName;
 
-    @XmlElement (defaultValue = "false", name = "shared")
+    @XmlElement(defaultValue = "false", name = "shared")
     Boolean shared;
 
     /*
@@ -50,15 +50,13 @@ public class NeutronMeteringLabel extends NeutronObject implements Serializable,
     /*
      *  constructor
      */
-    public NeutronMeteringLabel() { }
+    public NeutronMeteringLabel() {
+    }
 
     @Override
     public String toString() {
-        return "NeutronMeteringLabel [id=" + uuid +
-            ", name=" + meteringLabelName +
-            ", tenant_id=" + tenantID +
-            ", shared=" + shared +
-            "]";
+        return "NeutronMeteringLabel [id=" + uuid + ", name=" + meteringLabelName + ", tenant_id=" + tenantID
+                + ", shared=" + shared + "]";
     }
 
     /**
index 17ae8dc35eadc5632b072c441c85c5d20e74aa60..ed5ea1a078807ca991400a26ba24511f6d857dd6 100644 (file)
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronMeteringLabelRule extends NeutronObject implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "direction")
+    @XmlElement(name = "direction")
     String meteringLabelRuleDirection;
 
-    @XmlElement (defaultValue = "false", name = "excluded")
+    @XmlElement(defaultValue = "false", name = "excluded")
     Boolean meteringLabelRuleExcluded;
 
-    @XmlElement (name = "remote_ip_prefix")
+    @XmlElement(name = "remote_ip_prefix")
     String meteringLabelRuleRemoteIPPrefix;
 
-    @XmlElement (name = "metering_label_id")
+    @XmlElement(name = "metering_label_id")
     String meteringLabelRuleLabelID;
 
     /*
@@ -72,16 +72,14 @@ public class NeutronMeteringLabelRule extends NeutronObject implements Serializa
     /*
      *  constructor
      */
-    public NeutronMeteringLabelRule() { }
+    public NeutronMeteringLabelRule() {
+    }
 
     @Override
     public String toString() {
-        return "NeutronMeteringLabelRule [id=" + uuid +
-            ", tenantID=" + tenantID +
-            ", direction=" + meteringLabelRuleDirection +
-            ", excluded=" + meteringLabelRuleExcluded +
-            ", remote_ip_prefix=" + meteringLabelRuleRemoteIPPrefix +
-            ", metering_label_id=" + meteringLabelRuleLabelID + "]";
+        return "NeutronMeteringLabelRule [id=" + uuid + ", tenantID=" + tenantID + ", direction="
+                + meteringLabelRuleDirection + ", excluded=" + meteringLabelRuleExcluded + ", remote_ip_prefix="
+                + meteringLabelRuleRemoteIPPrefix + ", metering_label_id=" + meteringLabelRuleLabelID + "]";
     }
 
     /**
index 93f8c2c87c892f94e94792b68f02160f92a17375..571c4e18a89f6280ba32478606f83cc1892c2cf9 100644 (file)
@@ -25,44 +25,44 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
 
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String networkName;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (defaultValue = "false", name = "shared")
+    @XmlElement(defaultValue = "false", name = "shared")
     Boolean shared;
 
     //    @XmlElement (defaultValue = "false", name = "router:external")
-    @XmlElement (defaultValue="false", namespace="router", name="external")
+    @XmlElement(defaultValue = "false", namespace = "router", name = "external")
     Boolean routerExternal;
 
     //    @XmlElement (defaultValue = "flat", name = "provider:network_type")
-    @XmlElement (namespace="provider", name="network_type")
+    @XmlElement(namespace = "provider", name = "network_type")
     String providerNetworkType;
 
     //    @XmlElement (name = "provider:physical_network")
-    @XmlElement (namespace="provider", name="physical_network")
+    @XmlElement(namespace = "provider", name = "physical_network")
     String providerPhysicalNetwork;
 
     //    @XmlElement (name = "provider:segmentation_id")
-    @XmlElement (namespace="provider", name="segmentation_id")
+    @XmlElement(namespace = "provider", name = "segmentation_id")
     String providerSegmentationID;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (name="segments")
+    @XmlElement(name = "segments")
     List<NeutronNetwork_Segment> segments;
 
-    @XmlElement (name="vlan_transparent")
+    @XmlElement(name = "vlan_transparent")
     Boolean vlanTransparent;
 
-    @XmlElement (name="mtu")
+    @XmlElement(name = "mtu")
     Integer mtu;
 
-    @XmlElement (name = "qos_policy_id")
+    @XmlElement(name = "qos_policy_id")
     String qosPolicyId;
 
     /* This attribute lists the ports associated with an instance
@@ -103,23 +103,33 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(boolean newValue) {
         adminStateUp = newValue;
     }
 
-    public boolean isShared() { return shared; }
+    public boolean isShared() {
+        return shared;
+    }
 
-    public Boolean getShared() { return shared; }
+    public Boolean getShared() {
+        return shared;
+    }
 
     public void setShared(boolean newValue) {
         shared = newValue;
     }
 
-    public boolean isRouterExternal() { return routerExternal; }
+    public boolean isRouterExternal() {
+        return routerExternal;
+    }
 
-    public Boolean getRouterExternal() { return routerExternal; }
+    public Boolean getRouterExternal() {
+        return routerExternal;
+    }
 
     public void setRouterExternal(boolean newValue) {
         routerExternal = newValue;
@@ -244,12 +254,10 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
 
     @Override
     public String toString() {
-        return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + networkName + ", adminStateUp="
-                + adminStateUp + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
+        return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + networkName + ", adminStateUp=" + adminStateUp
+                + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
                 + ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork="
                 + providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + ", status=" + status
-                + ", qosPolicyId =" + qosPolicyId
-                + ", segments = " + segments + "]";
+                + ", qosPolicyId =" + qosPolicyId + ", segments = " + segments + "]";
     }
 }
-
index 0e1d22cd8475497aa53236b021142e03028ff083..88587ffe4e92d026206ea2633ba8e904ae464957 100644 (file)
@@ -24,15 +24,15 @@ public class NeutronNetwork_Segment implements Serializable {
     private static final long serialVersionUID = 1L;
 
     //    @XmlElement (defaultValue="flat", name="provider:network_type")
-    @XmlElement (defaultValue="flat", namespace="provider", name="network_type")
+    @XmlElement(defaultValue = "flat", namespace = "provider", name = "network_type")
     String providerNetworkType;
 
     //    @XmlElement (name="provider:physical_network")
-    @XmlElement (namespace="provider", name="physical_network")
+    @XmlElement(namespace = "provider", name = "physical_network")
     String providerPhysicalNetwork;
 
     //    @XmlElement (name="provider:segmentation_id")
-    @XmlElement (namespace="provider", name="segmentation_id")
+    @XmlElement(namespace = "provider", name = "segmentation_id")
     String providerSegmentationID;
 
     public NeutronNetwork_Segment() {
@@ -64,10 +64,8 @@ public class NeutronNetwork_Segment implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronNetwork_Segment [ " +
-               ", providerNetworkType=" + providerNetworkType +
-               ", providerPhysicalNetwork=" + providerPhysicalNetwork +
-               ", providerSegmentationID=" + providerSegmentationID + "]";
+        return "NeutronNetwork_Segment [ " + ", providerNetworkType=" + providerNetworkType
+                + ", providerPhysicalNetwork=" + providerPhysicalNetwork + ", providerSegmentationID="
+                + providerSegmentationID + "]";
     }
 }
-
index 85fba9f6f77aebe3b27bc069a64892e6f80bb59a..f6547053dbffc56bb6a3b730faa5a341bea2f57c 100644 (file)
@@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
 public class NeutronObject extends Neutron_ID implements Serializable, INeutronObject {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "tenant_id")
+    @XmlElement(name = "tenant_id")
     String tenantID;
 
     public NeutronObject() {
index 0013d511800c0a6c61a77292d623d9c647651a59..b1737543079ea6f5075791d0c21e7b5c4509af4e 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -20,7 +19,6 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public class NeutronPort extends NeutronObject implements Serializable, INeutronObject {
@@ -29,61 +27,61 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "network_id")
+    @XmlElement(name = "network_id")
     String networkUUID;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (name = "mac_address")
+    @XmlElement(name = "mac_address")
     String macAddress;
 
-    @XmlElement (name = "fixed_ips")
+    @XmlElement(name = "fixed_ips")
     List<Neutron_IPs> fixedIPs;
 
-    @XmlElement (name = "device_id")
+    @XmlElement(name = "device_id")
     String deviceID;
 
-    @XmlElement (name = "device_owner")
+    @XmlElement(name = "device_owner")
     String deviceOwner;
 
-    @XmlElement (name = "security_groups")
+    @XmlElement(name = "security_groups")
     List<NeutronSecurityGroup> securityGroups;
 
-    @XmlElement (name = "allowed_address_pairs")
+    @XmlElement(name = "allowed_address_pairs")
     List<NeutronPort_AllowedAddressPairs> allowedAddressPairs;
 
     //@XmlElement (name = "binding:host_id")
-    @XmlElement (namespace = "binding", name = "host_id")
+    @XmlElement(namespace = "binding", name = "host_id")
     String bindinghostID;
 
     //@XmlElement (name = "binding:vnic_type")
-    @XmlElement (namespace = "binding", name = "vnic_type")
+    @XmlElement(namespace = "binding", name = "vnic_type")
     String bindingvnicType;
 
     //@XmlElement (name = "binding:vif_type")
-    @XmlElement (namespace = "binding", name = "vif_type")
+    @XmlElement(namespace = "binding", name = "vif_type")
     String bindingvifType;
 
     //@XmlElement (name = "binding:vif_details")
-    @XmlElement (namespace = "binding", name = "vif_details")
+    @XmlElement(namespace = "binding", name = "vif_details")
     @XmlJavaTypeAdapter(NeutronResourceMapPropertyAdapter.class)
     Map<String, String> vifDetails;
 
-    @XmlElement (name = "extra_dhcp_opts")
+    @XmlElement(name = "extra_dhcp_opts")
     List<NeutronPort_ExtraDHCPOption> extraDHCPOptions;
 
     //Port security is enabled by default for backward compatibility.
-    @XmlElement (defaultValue = "true", name = "port_security_enabled")
+    @XmlElement(defaultValue = "true", name = "port_security_enabled")
     Boolean portSecurityEnabled;
 
-    @XmlElement (name = "qos_policy_id")
+    @XmlElement(name = "qos_policy_id")
     String qosPolicyId;
 
     public NeutronPort() {
@@ -112,7 +110,9 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(Boolean newValue) {
         adminStateUp = newValue;
@@ -220,6 +220,7 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
         }
         return portSecurityEnabled;
     }
+
     public String getQosPolicyId() {
         return qosPolicyId;
     }
@@ -228,7 +229,6 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
         this.qosPolicyId = qosPolicyId;
     }
 
-
     public void setPortSecurityEnabled(Boolean newValue) {
         portSecurityEnabled = newValue;
     }
@@ -245,7 +245,7 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
 
     public NeutronPort extractFields(List<String> fields) {
         NeutronPort ans = new NeutronPort();
-        for (String field: fields) {
+        for (String field : fields) {
             if ("id".equals(field)) {
                 ans.setID(this.getID());
             }
@@ -280,7 +280,8 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
                 ans.setSecurityGroups(new ArrayList<NeutronSecurityGroup>(this.getSecurityGroups()));
             }
             if ("allowed_address_pairs".equals(field)) {
-                ans.setAllowedAddressPairs(new ArrayList<NeutronPort_AllowedAddressPairs>(this.getAllowedAddressPairs()));
+                ans.setAllowedAddressPairs(
+                        new ArrayList<NeutronPort_AllowedAddressPairs>(this.getAllowedAddressPairs()));
             }
             if ("binding:host_id".equals(field)) {
                 ans.setBindinghostID(this.getBindinghostID());
@@ -321,16 +322,12 @@ public class NeutronPort extends NeutronObject implements Serializable, INeutron
 
     @Override
     public String toString() {
-        return "NeutronPort [portUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name
-                + ", adminStateUp=" + adminStateUp + ", status=" + status + ", macAddress=" + macAddress
-                + ", fixedIPs=" + fixedIPs + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID="
-                + tenantID + ", securityGroups=" + securityGroups
-                + ", allowedAddressPairs" + allowedAddressPairs
-                + ", bindinghostID=" + bindinghostID + ", bindingvnicType=" + bindingvnicType
-                + ", bindingvifType=" + bindingvifType
-                + ", vifDetails=" + vifDetails
-                + ", extraDHCPOptions=" + extraDHCPOptions
-                + ", portSecurityEnabled=" + portSecurityEnabled
-                + ", qosPolicyId=" + qosPolicyId +"]";
+        return "NeutronPort [portUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name + ", adminStateUp="
+                + adminStateUp + ", status=" + status + ", macAddress=" + macAddress + ", fixedIPs=" + fixedIPs
+                + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID=" + tenantID
+                + ", securityGroups=" + securityGroups + ", allowedAddressPairs" + allowedAddressPairs
+                + ", bindinghostID=" + bindinghostID + ", bindingvnicType=" + bindingvnicType + ", bindingvifType="
+                + bindingvifType + ", vifDetails=" + vifDetails + ", extraDHCPOptions=" + extraDHCPOptions
+                + ", portSecurityEnabled=" + portSecurityEnabled + ", qosPolicyId=" + qosPolicyId + "]";
     }
 }
index 41cd8726e1bac1a80855efa78a3419e95844a451..c2f537b1d8845ac66fac5014eed46d9455ec339d 100644 (file)
@@ -19,10 +19,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronPort_AllowedAddressPairs implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "mac_address")
+    @XmlElement(name = "mac_address")
     String macAddress;
 
-    @XmlElement (name = "ip_address")
+    @XmlElement(name = "ip_address")
     String ipAddress;
 
     public NeutronPort_AllowedAddressPairs() {
@@ -33,11 +33,19 @@ public class NeutronPort_AllowedAddressPairs implements Serializable {
         this.ipAddress = ipAddress;
     }
 
-    public String getMacAddress() { return(macAddress); }
+    public String getMacAddress() {
+        return (macAddress);
+    }
 
-    public void setMacAddress(String macAddress) { this.macAddress = macAddress; }
+    public void setMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+    }
 
-    public String getIpAddress() { return(ipAddress); }
+    public String getIpAddress() {
+        return (ipAddress);
+    }
 
-    public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; }
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
 }
index d33a2893c829cea63d3a054e337fabc484a051dc..b2b9df6be7fa76fccf9db99ba1fd9efe7bc0908e 100644 (file)
@@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class NeutronPort_ExtraDHCPOption implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement (name = "opt_value")
+    @XmlElement(name = "opt_value")
     String value;
 
-    @XmlElement (name = "opt_name")
+    @XmlElement(name = "opt_name")
     String name;
 
-    @XmlElement (name = "ip_version", defaultValue = "4", required = false, nillable = true)
+    @XmlElement(name = "ip_version", defaultValue = "4", required = false, nillable = true)
     Integer ipVersion = 4;
 
     public NeutronPort_ExtraDHCPOption() {
@@ -37,15 +37,27 @@ public class NeutronPort_ExtraDHCPOption implements Serializable {
         this.ipVersion = ipVersion;
     }
 
-    public String getValue() { return(value); }
+    public String getValue() {
+        return (value);
+    }
 
-    public void setValue(String value) { this.value = value; }
+    public void setValue(String value) {
+        this.value = value;
+    }
 
-    public String getName() { return(name); }
+    public String getName() {
+        return (name);
+    }
 
-    public void setName(String name) { this.name = name; }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-    public Integer getIpVersion() { return ipVersion; }
+    public Integer getIpVersion() {
+        return ipVersion;
+    }
 
-    public void setIpVersion(Integer ipVersion) { this.ipVersion = ipVersion; }
+    public void setIpVersion(Integer ipVersion) {
+        this.ipVersion = ipVersion;
+    }
 }
index 50fefd7d16bc78993e93f4e547aac45e2954e959..0e97d3cc0e1dbb70509c1bac444ca0067adb21d9 100644 (file)
@@ -67,11 +67,8 @@ public class NeutronQosBandwidthRule extends NeutronObject implements Serializab
 
     @Override
     public String toString() {
-        return "qosBandwidthRules{" +
-            "qosBandwidthRuleUUID='" + uuid + '\'' +
-            ", qosBandwidthRuleTenantID='" + tenantID + '\'' +
-            ", qosBandwidthMaxValue='" + maxKbps + '\'' +
-            ", qosBandwidthMaxBurst='" + maxBurstKbps + '\'' +
-            '}';
+        return "qosBandwidthRules{" + "qosBandwidthRuleUUID='" + uuid + '\'' + ", qosBandwidthRuleTenantID='" + tenantID
+                + '\'' + ", qosBandwidthMaxValue='" + maxKbps + '\'' + ", qosBandwidthMaxBurst='" + maxBurstKbps + '\''
+                + '}';
     }
 }
index 9ae258c77ce408fa1420b60ce315aaadbc7c3904..a3202dcdc4dd9f4e910fe4b3d5fe4664595a68af 100644 (file)
@@ -52,10 +52,7 @@ public class NeutronQosDscpMarkingRule extends NeutronObject implements Serializ
 
     @Override
     public String toString() {
-        return "qosDscpRules{" +
-            "qosDscpRuleUUID='" + uuid + '\'' +
-            ", qosDscpRuleTenantID='" + tenantID + '\'' +
-            ", qosDscpRuleDscpMark='" + dscpMark + '\'' +
-            '}';
+        return "qosDscpRules{" + "qosDscpRuleUUID='" + uuid + '\'' + ", qosDscpRuleTenantID='" + tenantID + '\''
+                + ", qosDscpRuleDscpMark='" + dscpMark + '\'' + '}';
     }
 }
index 5f46e76fa66cbf639d8a00dd00e8a326ff59ebb4..161860fd49ab610e82fa25c0fef0d19798632e1c 100644 (file)
@@ -99,13 +99,8 @@ public class NeutronQosPolicy extends NeutronObject implements Serializable, INe
 
     @Override
     public String toString() {
-        return "NeutronQosPolicy{" +
-            "qosPolicyUUID='" + uuid + '\'' +
-            ", qosPolicyTenantID='" + tenantID + '\'' +
-            ", qosPolicyName='" + name + '\'' +
-            ", qosPolicyIsShared='" + shared + '\'' +
-            ", qosBwLimitRules='" + bwLimitRules + '\'' +
-            ", qosDscpRules='" + dscpRules + '\'' +
-            '}';
+        return "NeutronQosPolicy{" + "qosPolicyUUID='" + uuid + '\'' + ", qosPolicyTenantID='" + tenantID + '\''
+                + ", qosPolicyName='" + name + '\'' + ", qosPolicyIsShared='" + shared + '\'' + ", qosBwLimitRules='"
+                + bwLimitRules + '\'' + ", qosDscpRules='" + dscpRules + '\'' + '}';
     }
 }
index 2f2ed6beeddef76eb24647e918c8f3154474ac78..f9b9363e31742f010eff27a715ecb82a1ab3f706 100644 (file)
@@ -22,8 +22,7 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 public class NeutronResourceMapPropertyAdapter extends XmlAdapter<Object, Map<String, String>> {
-    private static final Logger LOGGER = LoggerFactory
-        .getLogger(NeutronResourceMapPropertyAdapter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NeutronResourceMapPropertyAdapter.class);
 
     @Override
     public Map<String, String> unmarshal(Object domTree) {
index 971b92483b0725f5b6257ada995d408e3ea660c7..0f5d1d88ad3dce237314fb20039f78182fd248df 100644 (file)
@@ -31,7 +31,8 @@ public class NeutronRoute implements Serializable {
     /**
      *  HostRoute constructor
      */
-    public NeutronRoute() { }
+    public NeutronRoute() {
+    }
 
     public String getDestination() {
         return destination;
@@ -51,9 +52,7 @@ public class NeutronRoute implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronRoute [" +
-            "destination=" + destination +
-            ", nextHop=" + nextHop + "]";
+        return "NeutronRoute [" + "destination=" + destination + ", nextHop=" + nextHop + "]";
     }
 
 }
index 74dc54230f1bcc7255555208c0591e0f40b7b605..66df248bc2a505f7c3c0a74050f90f2fa68a0bb1 100644 (file)
@@ -24,25 +24,25 @@ public class NeutronRouter extends NeutronObject implements Serializable, INeutr
 
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (name = "external_gateway_info", nillable = true)
+    @XmlElement(name = "external_gateway_info", nillable = true)
     NeutronRouter_NetworkReference externalGatewayInfo;
 
-    @XmlElement (name = "distributed")
+    @XmlElement(name = "distributed")
     Boolean distributed;
 
-    @XmlElement (name = "gw_port_id", nillable = true)
+    @XmlElement(name = "gw_port_id", nillable = true)
     String gatewayPortId;
 
-    @XmlElement (name = "routes")
+    @XmlElement(name = "routes")
     List<NeutronRoute> routes;
 
     public NeutronRouter() {
@@ -63,7 +63,9 @@ public class NeutronRouter extends NeutronObject implements Serializable, INeutr
         return adminStateUp;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(Boolean newValue) {
         adminStateUp = newValue;
@@ -147,7 +149,7 @@ public class NeutronRouter extends NeutronObject implements Serializable, INeutr
             if (s.equals("gw_port_id")) {
                 ans.setGatewayPortId(this.getGatewayPortId());
             }
-            if (s.equals("routes")){
+            if (s.equals("routes")) {
                 ans.setRoutes(this.getRoutes());
             }
         }
@@ -161,17 +163,9 @@ public class NeutronRouter extends NeutronObject implements Serializable, INeutr
 
     @Override
     public String toString() {
-        return "NeutronRouter [" +
-            "id=" + uuid +
-            ", name=" + name +
-            ", adminStateUp=" + adminStateUp +
-            ", status=" + status +
-            ", tenantID=" + tenantID +
-            ", external_gateway_info=" + externalGatewayInfo +
-            ", distributed=" + distributed +
-            ", gw_port_id=" + gatewayPortId +
-            ", routes=" + routes +
-            "]";
+        return "NeutronRouter [" + "id=" + uuid + ", name=" + name + ", adminStateUp=" + adminStateUp + ", status="
+                + status + ", tenantID=" + tenantID + ", external_gateway_info=" + externalGatewayInfo
+                + ", distributed=" + distributed + ", gw_port_id=" + gatewayPortId + ", routes=" + routes + "]";
     }
 
 }
index e1df719ce3d418548d7e3114e8e731da246329ae..3e6a25e3669f595974bc7573b0535a880b93f2ee 100644 (file)
@@ -22,10 +22,10 @@ public class NeutronRouter_Interface extends NeutronObject implements Serializab
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "subnet_id")
+    @XmlElement(name = "subnet_id")
     String subnetUUID;
 
-    @XmlElement (name = "port_id")
+    @XmlElement(name = "port_id")
     String portUUID;
 
     public NeutronRouter_Interface() {
@@ -54,10 +54,7 @@ public class NeutronRouter_Interface extends NeutronObject implements Serializab
 
     @Override
     public String toString() {
-        return "NeutronRouterInterface [" +
-            "subnetUUID=" + subnetUUID +
-            ", portUUID=" + portUUID +
-            ", id=" + uuid +
-            ", tenantID=" + tenantID + "]";
+        return "NeutronRouterInterface [" + "subnetUUID=" + subnetUUID + ", portUUID=" + portUUID + ", id=" + uuid
+                + ", tenantID=" + tenantID + "]";
     }
 }
index 09fc77a824de33ed8448cca00de40254f02eaec0..c89645e6ad218c534abc03b99d102d3f69ca1a5d 100644 (file)
@@ -62,9 +62,8 @@ public class NeutronRouter_NetworkReference implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronRouterNetworkReference [networkID=" + networkID +
-            " enableSNAT=" + enableSNAT +
-            " externalFixedIPs=" + externalFixedIPs + "]";
+        return "NeutronRouterNetworkReference [networkID=" + networkID + " enableSNAT=" + enableSNAT
+                + " externalFixedIPs=" + externalFixedIPs + "]";
     }
 
 }
index fbbf6405a2a8d53c05970bf06a545e2b83b08e33..67e4c9150add7816bfba42edb05e3c5ed968255e 100644 (file)
@@ -221,19 +221,12 @@ public class NeutronSFCFlowClassifier extends NeutronObject implements Serializa
 
     @Override
     public String toString() {
-        return "NeutronSFCFlowClassifier[" +
-                "name='" + name + '\'' +
-                ", ethertype='" + ethertype + '\'' +
-                ", protocol='" + protocol + '\'' +
-                ", sourcePortRangeMin=" + sourcePortRangeMin +
-                ", sourcePortRangeMax=" + sourcePortRangeMax +
-                ", destinationPortRangeMin=" + destinationPortRangeMin +
-                ", destinationPortRangeMax=" + destinationPortRangeMax +
-                ", sourceIpPrefix='" + sourceIpPrefix + '\'' +
-                ", destinationIpPrefix='" + destinationIpPrefix + '\'' +
-                ", logicalSourcePortUUID='" + logicalSourcePortUUID + '\'' +
-                ", logicalDestinationPortUUID='" + logicalDestinationPortUUID + '\'' +
-                ", l7Parameters=" + l7Parameters +
-                ']';
+        return "NeutronSFCFlowClassifier[" + "name='" + name + '\'' + ", ethertype='" + ethertype + '\''
+                + ", protocol='" + protocol + '\'' + ", sourcePortRangeMin=" + sourcePortRangeMin
+                + ", sourcePortRangeMax=" + sourcePortRangeMax + ", destinationPortRangeMin=" + destinationPortRangeMin
+                + ", destinationPortRangeMax=" + destinationPortRangeMax + ", sourceIpPrefix='" + sourceIpPrefix + '\''
+                + ", destinationIpPrefix='" + destinationIpPrefix + '\'' + ", logicalSourcePortUUID='"
+                + logicalSourcePortUUID + '\'' + ", logicalDestinationPortUUID='" + logicalDestinationPortUUID + '\''
+                + ", l7Parameters=" + l7Parameters + ']';
     }
 }
index 339686d14ff4a35d85e0f7dcbd5024d6c53f1f70..9a34bc6da70f3ad845ae1b99ab1ac0113a6e95ae 100644 (file)
@@ -112,12 +112,8 @@ public class NeutronSFCPortChain extends NeutronObject implements Serializable,
 
     @Override
     public String toString() {
-        return "NeutronSFCPortChain[" +
-                "tenantID='" + tenantID + '\'' +
-                ", name='" + name + '\'' +
-                ", portPairGroupsUUID=" + portPairGroupsUUID +
-                ", flowClassifiersUUID='" + flowClassifiersUUID + '\'' +
-                ", chainParameters=" + chainParameters +
-                ']';
+        return "NeutronSFCPortChain[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\''
+                + ", portPairGroupsUUID=" + portPairGroupsUUID + ", flowClassifiersUUID='" + flowClassifiersUUID + '\''
+                + ", chainParameters=" + chainParameters + ']';
     }
 }
index 01eedac10713cbb830e3e1923220ed474126d4e0..f0d16ca4c0aa0b6d96e97c66bdca7520647a496a 100644 (file)
@@ -111,15 +111,10 @@ public class NeutronSFCPortPair extends NeutronObject implements Serializable, I
         return ans;
     }
 
-
     @Override
     public String toString() {
-        return "NeutronSFCPortPair[" +
-                "tenantID='" + tenantID + '\'' +
-                ", name='" + name + '\'' +
-                ", ingressPortUUID='" + ingressPortUUID + '\'' +
-                ", egressPortUUID='" + egressPortUUID + '\'' +
-                ", serviceFunctionParameters=" + serviceFunctionParameters +
-                ']';
+        return "NeutronSFCPortPair[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\'' + ", ingressPortUUID='"
+                + ingressPortUUID + '\'' + ", egressPortUUID='" + egressPortUUID + '\'' + ", serviceFunctionParameters="
+                + serviceFunctionParameters + ']';
     }
 }
index cbdce07aa03014d750b51d9283c18d1b3681961c..ae0dd35bd632f46d458d1e9b651e9f9cf360251b 100644 (file)
@@ -81,10 +81,7 @@ public class NeutronSFCPortPairGroup extends NeutronObject implements Serializab
 
     @Override
     public String toString() {
-        return "NeutronSFCPortPairGroup[" +
-                "tenantID='" + tenantID + '\'' +
-                ", name='" + name + '\'' +
-                ", portPairs=" + portPairs +
-                ']';
+        return "NeutronSFCPortPairGroup[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\'' + ", portPairs="
+                + portPairs + ']';
     }
 }
index 9a8bc5285590f496f40ede67490d6c1369f58449..f0cab37d96a5cf5e5b27ace297ff382177fe4960 100644 (file)
@@ -47,18 +47,18 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
     }
 
     public NeutronSecurityGroup extractFields(List<String> fields) {
-        NeutronSecurityGroup ans = new NeutronSecurityGroup ();
-        Iterator<String> i = fields.iterator ();
-        while (i.hasNext ()) {
-            String s = i.next ();
-            if (s.equals ("id")) {
-                ans.setID (this.getID ());
+        NeutronSecurityGroup ans = new NeutronSecurityGroup();
+        Iterator<String> i = fields.iterator();
+        while (i.hasNext()) {
+            String s = i.next();
+            if (s.equals("id")) {
+                ans.setID(this.getID());
             }
-            if (s.equals ("name")) {
-                ans.setSecurityGroupName (this.getSecurityGroupName ());
+            if (s.equals("name")) {
+                ans.setSecurityGroupName(this.getSecurityGroupName());
             }
-            if (s.equals ("tenant_id")) {
-                ans.setTenantID (this.getTenantID ());
+            if (s.equals("tenant_id")) {
+                ans.setTenantID(this.getTenantID());
             }
         }
         return ans;
@@ -66,11 +66,8 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
 
     @Override
     public String toString() {
-        return "NeutronSecurityGroup{" +
-                "securityGroupUUID='" + uuid + '\'' +
-                ", securityGroupName='" + securityGroupName + '\'' +
-                ", securityGroupTenantID='" + tenantID + '\'' +
-                "]";
+        return "NeutronSecurityGroup{" + "securityGroupUUID='" + uuid + '\'' + ", securityGroupName='"
+                + securityGroupName + '\'' + ", securityGroupTenantID='" + tenantID + '\'' + "]";
     }
 
     @Override
index f0325e4abcd60bc9d73016d614609100c3d0340a..db2d4d90efc4155d1ca20d747a62b4a77d0256ae 100644 (file)
@@ -170,18 +170,13 @@ public class NeutronSecurityRule extends NeutronObject implements Serializable,
 
     @Override
     public String toString() {
-        return "NeutronSecurityRule{" +
-            "securityRuleUUID='" + uuid + '\'' +
-            ", securityRuleDirection='" + securityRuleDirection + '\'' +
-            ", securityRuleProtocol='" + securityRuleProtocol + '\'' +
-            ", securityRulePortMin=" + securityRulePortMin +
-            ", securityRulePortMax=" + securityRulePortMax +
-            ", securityRuleEthertype='" + securityRuleEthertype + '\'' +
-            ", securityRuleRemoteIpPrefix='" + securityRuleRemoteIpPrefix + '\'' +
-            ", securityRemoteGroupID=" + securityRemoteGroupID +
-            ", securityRuleGroupID='" + securityRuleGroupID + '\'' +
-            ", securityRuleTenantID='" + tenantID + '\'' +
-            '}';
+        return "NeutronSecurityRule{" + "securityRuleUUID='" + uuid + '\'' + ", securityRuleDirection='"
+                + securityRuleDirection + '\'' + ", securityRuleProtocol='" + securityRuleProtocol + '\''
+                + ", securityRulePortMin=" + securityRulePortMin + ", securityRulePortMax=" + securityRulePortMax
+                + ", securityRuleEthertype='" + securityRuleEthertype + '\'' + ", securityRuleRemoteIpPrefix='"
+                + securityRuleRemoteIpPrefix + '\'' + ", securityRemoteGroupID=" + securityRemoteGroupID
+                + ", securityRuleGroupID='" + securityRuleGroupID + '\'' + ", securityRuleTenantID='" + tenantID + '\''
+                + '}';
     }
 
     @Override
index fb58e3f1bdddfb15dbc7572c8e4d81fb4f5bac58..4b4b3f020c1ddbe2841458a75fd518d8f7759554 100644 (file)
@@ -29,8 +29,7 @@ import org.slf4j.LoggerFactory;
 @XmlAccessorType(XmlAccessType.NONE)
 
 public class NeutronSubnet extends NeutronObject implements Serializable, INeutronObject {
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(NeutronCRUDInterfaces.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NeutronCRUDInterfaces.class);
 
     private static final long serialVersionUID = 1L;
     private static final int IPV4_VERSION = 4;
@@ -43,37 +42,37 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "network_id")
+    @XmlElement(name = "network_id")
     String networkUUID;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (defaultValue = "4", name = "ip_version")
+    @XmlElement(defaultValue = "4", name = "ip_version")
     Integer ipVersion;
 
-    @XmlElement (name = "cidr")
+    @XmlElement(name = "cidr")
     String cidr;
 
-    @XmlElement (name = "gateway_ip")
+    @XmlElement(name = "gateway_ip")
     String gatewayIP;
 
-    @XmlElement (name = "dns_nameservers")
+    @XmlElement(name = "dns_nameservers")
     List<String> dnsNameservers;
 
-    @XmlElement (name = "allocation_pools")
+    @XmlElement(name = "allocation_pools")
     List<NeutronSubnetIPAllocationPool> allocationPools;
 
-    @XmlElement (name = "host_routes")
+    @XmlElement(name = "host_routes")
     List<NeutronRoute> hostRoutes;
 
-    @XmlElement (defaultValue = "true", name = "enable_dhcp")
+    @XmlElement(defaultValue = "true", name = "enable_dhcp")
     Boolean enableDHCP;
 
-    @XmlElement (name = "ipv6_address_mode", nillable = true)
+    @XmlElement(name = "ipv6_address_mode", nillable = true)
     String ipV6AddressMode;
 
-    @XmlElement (name = "ipv6_ra_mode", nillable = true)
+    @XmlElement(name = "ipv6_ra_mode", nillable = true)
     String ipV6RaMode;
 
     public String getNetworkUUID() {
@@ -147,19 +146,29 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
         return enableDHCP;
     }
 
-    public Boolean getEnableDHCP() { return enableDHCP; }
+    public Boolean getEnableDHCP() {
+        return enableDHCP;
+    }
 
     public void setEnableDHCP(Boolean newValue) {
-            enableDHCP = newValue;
+        enableDHCP = newValue;
     }
 
-    public String getIpV6AddressMode() { return ipV6AddressMode; }
+    public String getIpV6AddressMode() {
+        return ipV6AddressMode;
+    }
 
-    public void setIpV6AddressMode(String ipV6AddressMode) { this.ipV6AddressMode = ipV6AddressMode; }
+    public void setIpV6AddressMode(String ipV6AddressMode) {
+        this.ipV6AddressMode = ipV6AddressMode;
+    }
 
-    public String getIpV6RaMode() { return ipV6RaMode; }
+    public String getIpV6RaMode() {
+        return ipV6RaMode;
+    }
 
-    public void setIpV6RaMode(String ipV6RaMode) { this.ipV6RaMode = ipV6RaMode; }
+    public void setIpV6RaMode(String ipV6RaMode) {
+        this.ipV6RaMode = ipV6RaMode;
+    }
 
     /**
      * This method copies selected fields from the object and returns them
@@ -260,14 +269,15 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
                 byte[] addrBytes = ((Inet6Address) InetAddress.getByName(parts[0])).getAddress();
                 int i;
                 for (i = length; i < IPV6_LENGTH; i++) {
-                    if (((((int) addrBytes[i/IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET-(i%IPV6_LENGTH_BYTES)))) != 0) {
-                        return(false);
+                    if (((((int) addrBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
+                            & (1 << (IPV6_BYTE_OFFSET - (i % IPV6_LENGTH_BYTES)))) != 0) {
+                        return (false);
                     }
                 }
-                return(true);
+                return (true);
             } catch (UnknownHostException e) {
                 LOGGER.warn("Failure in isValidCIDR()", e);
-                return(false);
+                return (false);
             }
         }
         return false;
@@ -315,9 +325,8 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
                         gatewayIP = info.getLowAddress();
                     }
                     if (allocationPools.size() < 1) {
-                        NeutronSubnetIPAllocationPool source =
-                            new NeutronSubnetIPAllocationPool(info.getLowAddress(),
-                                    info.getHighAddress());
+                        NeutronSubnetIPAllocationPool source = new NeutronSubnetIPAllocationPool(info.getLowAddress(),
+                                info.getHighAddress());
                         allocationPools = source.splitPool(gatewayIP);
                     }
                 } catch (IllegalArgumentException e) {
@@ -335,14 +344,14 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
                     BigInteger lowAddress_bi = NeutronSubnetIPAllocationPool.convertV6(parts[0]);
                     String lowAddress = NeutronSubnetIPAllocationPool.bigIntegerToIP(lowAddress_bi.add(BigInteger.ONE));
                     BigInteger mask = BigInteger.ONE.shiftLeft(length).subtract(BigInteger.ONE);
-                    String highAddress = NeutronSubnetIPAllocationPool.bigIntegerToIP(lowAddress_bi.add(mask).subtract(BigInteger.ONE));
+                    String highAddress = NeutronSubnetIPAllocationPool
+                            .bigIntegerToIP(lowAddress_bi.add(mask).subtract(BigInteger.ONE));
                     if (gatewayIP == null || ("").equals(gatewayIP)) {
                         gatewayIP = lowAddress;
                     }
                     if (allocationPools.size() < 1) {
-                        NeutronSubnetIPAllocationPool source =
-                            new NeutronSubnetIPAllocationPool(lowAddress,
-                                    highAddress);
+                        NeutronSubnetIPAllocationPool source = new NeutronSubnetIPAllocationPool(lowAddress,
+                                highAddress);
                         allocationPools = source.splitPoolV6(gatewayIP);
                     }
                 } catch (Exception e) {
@@ -373,18 +382,19 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
             try {
                 int length = Integer.parseInt(parts[1]);
                 byte[] cidrBytes = ((Inet6Address) InetAddress.getByName(parts[0])).getAddress();
-                byte[] ipBytes =  ((Inet6Address) InetAddress.getByName(ipAddress)).getAddress();
+                byte[] ipBytes = ((Inet6Address) InetAddress.getByName(ipAddress)).getAddress();
                 int i;
                 for (i = 0; i < length; i++) {
-                    if (((((int) cidrBytes[i/IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET-(i%IPV6_LENGTH_BYTES)))) !=
-                        ((((int) ipBytes[i/IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET-(i%IPV6_LENGTH_BYTES))))) {
-                        return(false);
+                    if (((((int) cidrBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET
+                            - (i % IPV6_LENGTH_BYTES)))) != ((((int) ipBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
+                                    & (1 << (IPV6_BYTE_OFFSET - (i % IPV6_LENGTH_BYTES))))) {
+                        return (false);
                     }
                 }
-                return(true);
+                return (true);
             } catch (UnknownHostException e) {
                 LOGGER.warn("Failure in isValidIP()", e);
-                return(false);
+                return (false);
             }
         }
         return false;
@@ -401,29 +411,26 @@ public class NeutronSubnet extends NeutronObject implements Serializable, INeutr
             NeutronSubnetIPAllocationPool pool = i.next();
             if (ans == null) {
                 ans = pool.getPoolStart();
-            }
-            else {
-                if (ipVersion == IPV4_VERSION &&
-                    NeutronSubnetIPAllocationPool.convert(pool.getPoolStart()) <
-                            NeutronSubnetIPAllocationPool.convert(ans)) {
+            } else {
+                if (ipVersion == IPV4_VERSION && NeutronSubnetIPAllocationPool
+                        .convert(pool.getPoolStart()) < NeutronSubnetIPAllocationPool.convert(ans)) {
                     ans = pool.getPoolStart();
                 }
-                if (ipVersion == IPV6_VERSION &&
-                    NeutronSubnetIPAllocationPool.convertV6(pool.getPoolStart()).compareTo(NeutronSubnetIPAllocationPool.convertV6(ans)) < 0) {
+                if (ipVersion == IPV6_VERSION && NeutronSubnetIPAllocationPool.convertV6(pool.getPoolStart())
+                        .compareTo(NeutronSubnetIPAllocationPool.convertV6(ans)) < 0) {
                     ans = pool.getPoolStart();
                 }
-           }
+            }
         }
         return ans;
     }
 
     @Override
     public String toString() {
-        return "NeutronSubnet [subnetUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name
-                + ", ipVersion=" + ipVersion + ", cidr=" + cidr + ", gatewayIP=" + gatewayIP + ", dnsNameservers="
-                + dnsNameservers + ", allocationPools=" + allocationPools + ", hostRoutes=" + hostRoutes
-                + ", enableDHCP=" + enableDHCP + ", tenantID=" + tenantID
-                + ", ipv6AddressMode=" + ipV6AddressMode
-                + ", ipv6RaMode=" + ipV6RaMode + "]";
+        return "NeutronSubnet [subnetUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name + ", ipVersion="
+                + ipVersion + ", cidr=" + cidr + ", gatewayIP=" + gatewayIP + ", dnsNameservers=" + dnsNameservers
+                + ", allocationPools=" + allocationPools + ", hostRoutes=" + hostRoutes + ", enableDHCP=" + enableDHCP
+                + ", tenantID=" + tenantID + ", ipv6AddressMode=" + ipV6AddressMode + ", ipv6RaMode=" + ipV6RaMode
+                + "]";
     }
 }
index af4f51616fc9de6aad8e8b91a6826af89b1936da..e56d43d25f98617a5262cfddf90f5d28455bd0ef 100644 (file)
@@ -24,8 +24,7 @@ import org.slf4j.LoggerFactory;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public class NeutronSubnetIPAllocationPool implements Serializable {
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(NeutronSubnetIPAllocationPool.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSubnetIPAllocationPool.class);
 
     private static final long serialVersionUID = 1L;
 
@@ -80,7 +79,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
         long inputIP = convert(inputString);
         long startIP = convert(poolStart);
         long endIP = convert(poolEnd);
-        return (inputIP >= startIP && inputIP <= endIP);
+        return inputIP >= startIP && inputIP <= endIP;
     }
 
     /**
@@ -97,7 +96,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
         long ans = 0;
         if (inputString != null) {
             String[] parts = inputString.split("\\.");
-            for (String part: parts) {
+            for (String part : parts) {
                 ans <<= BYTE_LENGTH;
                 ans |= Integer.parseInt(part);
             }
@@ -118,7 +117,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
         BigInteger inputIP = convertV6(inputString);
         BigInteger startIP = convertV6(poolStart);
         BigInteger endIP = convertV6(poolEnd);
-        return (inputIP.compareTo(startIP) >= 0 && inputIP.compareTo(endIP) <= 0);
+        return inputIP.compareTo(startIP) >= 0 && inputIP.compareTo(endIP) <= 0;
     }
 
     /**
@@ -156,10 +155,10 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
         long ipLong = input;
         String[] parts = new String[IPV4_DOTTED_QUADS];
         for (part = 0; part < IPV4_DOTTED_QUADS; part++) {
-            parts[IPV4_DOTTED_QUAD_OFFSET-part] = String.valueOf(ipLong & IPV4_DOTTED_QUAD_MASK);
+            parts[IPV4_DOTTED_QUAD_OFFSET - part] = String.valueOf(ipLong & IPV4_DOTTED_QUAD_MASK);
             ipLong >>= BYTE_LENGTH;
         }
-        return join(parts,".");
+        return join(parts, ".");
     }
 
     /**
@@ -182,14 +181,13 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
     /*
      * helper routine used by longToIP
      */
-    public static String join(String r[],String separator)
-    {
+    public static String join(String[] r, String separator) {
         if (r.length == 0) {
             return "";
         }
         StringBuilder sb = new StringBuilder();
         int i;
-        for(i = 0;i < r.length - 1;i++) {
+        for (i = 0; i < r.length - 1; i++) {
             sb.append(r[i]);
             sb.append(separator);
         }
@@ -209,7 +207,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
      * the other ranging from parameter+1 to high
      */
     public List<NeutronSubnetIPAllocationPool> splitPool(String ipAddress) {
-        List<NeutronSubnetIPAllocationPool> ans = new ArrayList<NeutronSubnetIPAllocationPool>();
+        List<NeutronSubnetIPAllocationPool> ans = new ArrayList<>();
         long gIP = NeutronSubnetIPAllocationPool.convert(ipAddress);
         long sIP = NeutronSubnetIPAllocationPool.convert(poolStart);
         long eIP = NeutronSubnetIPAllocationPool.convert(poolEnd);
@@ -223,14 +221,14 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
                     poolStarted = true;
                 } else {
                     //FIX for bug 533
-                    p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i+1));
+                    p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i + 1));
                 }
             }
             if (i == eIP) {
                 if (i != gIP) {
                     p.setPoolEnd(poolEnd);
                 } else {
-                    p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i-1));
+                    p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i - 1));
                 }
                 ans.add(p);
             }
@@ -241,12 +239,12 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
                         poolStarted = true;
                     }
                 } else {
-                    p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i-1));
+                    p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i - 1));
                     poolStarted = false;
                     ans.add(p);
                     p = new NeutronSubnetIPAllocationPool();
                     // Fix for 2120
-                    p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i+1));
+                    p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i + 1));
                     poolStarted = true;
                 }
             }
@@ -256,9 +254,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
 
     @Override
     public String toString() {
-        return "NeutronSubnetIPAllocationPool [" +
-            "start=" + poolStart +
-            ", end=" + poolEnd + "]";
+        return "NeutronSubnetIPAllocationPool [" + "start=" + poolStart + ", end=" + poolEnd + "]";
     }
 
     /*
@@ -275,7 +271,7 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
      * If the pool is a single address, return null
      */
     public List<NeutronSubnetIPAllocationPool> splitPoolV6(String ipAddress) {
-        List<NeutronSubnetIPAllocationPool> ans = new ArrayList<NeutronSubnetIPAllocationPool>();
+        List<NeutronSubnetIPAllocationPool> ans = new ArrayList<>();
         BigInteger gIP = NeutronSubnetIPAllocationPool.convertV6(ipAddress);
         BigInteger sIP = NeutronSubnetIPAllocationPool.convertV6(poolStart);
         BigInteger eIP = NeutronSubnetIPAllocationPool.convertV6(poolEnd);
@@ -284,14 +280,14 @@ public class NeutronSubnetIPAllocationPool implements Serializable {
             p.setPoolStart(NeutronSubnetIPAllocationPool.bigIntegerToIP(sIP.add(BigInteger.ONE)));
             p.setPoolEnd(poolEnd);
             ans.add(p);
-            return(ans);
+            return ans;
         }
         if (gIP.compareTo(eIP) == 0 && gIP.compareTo(sIP) > 0) {
             NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
             p.setPoolStart(poolStart);
             p.setPoolEnd(NeutronSubnetIPAllocationPool.bigIntegerToIP(eIP.subtract(BigInteger.ONE)));
             ans.add(p);
-            return(ans);
+            return ans;
         }
         if (gIP.compareTo(eIP) < 0 && gIP.compareTo(sIP) > 0) {
             NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
index a99ee4983b60510b1d9842c4a4423cbfa2861be4..7c6c5b31f1ea7dc3b7c0516bbc089c469625b549 100644 (file)
@@ -22,13 +22,13 @@ public class NeutronVPNDeadPeerDetection implements Serializable {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "action")
+    @XmlElement(name = "action")
     String action;
 
-    @XmlElement (name = "interval")
+    @XmlElement(name = "interval")
     Integer interval;
 
-    @XmlElement (name = "timeout")
+    @XmlElement(name = "timeout")
     Integer timeout;
 
     public NeutronVPNDeadPeerDetection() {
index 414ec62a60298b84ee4ecb33728887e7f7ab3260..54ec75e50a69f13f0dc4c36fd2b61a39ce3e78f5 100644 (file)
@@ -24,25 +24,25 @@ public class NeutronVPNIKEPolicy extends NeutronObject implements Serializable,
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (name = "auth_algorithm")
+    @XmlElement(name = "auth_algorithm")
     String authAlgorithm;
 
-    @XmlElement (name = "encryption_algorithm")
+    @XmlElement(name = "encryption_algorithm")
     String encryptionAlgorithm;
 
-    @XmlElement (name = "phase1_negotiation_mode")
+    @XmlElement(name = "phase1_negotiation_mode")
     String phase1NegotiationMode;
 
-    @XmlElement (name = "pfs")
+    @XmlElement(name = "pfs")
     String perfectForwardSecrecy;
 
-    @XmlElement (name = "ike_version")
+    @XmlElement(name = "ike_version")
     String ikeVersion;
 
-    @XmlElement (name = "lifetime")
+    @XmlElement(name = "lifetime")
     NeutronVPNLifetime lifetime;
 
     public NeutronVPNIKEPolicy() {
index 3fcd026a4b321990b1e055b6f8dc9f0b3b4fe959..eee86a670a0bd24ced164debea2c4717bddd9641 100644 (file)
@@ -24,25 +24,25 @@ public class NeutronVPNIPSECPolicy extends NeutronObject implements Serializable
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (name = "transform_protocol")
+    @XmlElement(name = "transform_protocol")
     String transformProtocol;
 
-    @XmlElement (name = "encapsulation_mode")
+    @XmlElement(name = "encapsulation_mode")
     String encapsulationMode;
 
-    @XmlElement (name = "auth_algorithm")
+    @XmlElement(name = "auth_algorithm")
     String authAlgorithm;
 
-    @XmlElement (name = "encryption_algorithm")
+    @XmlElement(name = "encryption_algorithm")
     String encryptionAlgorithm;
 
-    @XmlElement (name = "pfs")
+    @XmlElement(name = "pfs")
     String perfectForwardSecrecy;
 
-    @XmlElement (name = "lifetime")
+    @XmlElement(name = "lifetime")
     NeutronVPNLifetime lifetime;
 
     public NeutronVPNIPSECPolicy() {
index 5746daf025447577e62035aef194bacf379f491c..aa14c704a439481a44a9faebee373b0169479038 100644 (file)
@@ -24,49 +24,49 @@ public class NeutronVPNIPSECSiteConnection extends NeutronObject implements Seri
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (name = "peer_address")
+    @XmlElement(name = "peer_address")
     String peerAddress;
 
-    @XmlElement (name = "peer_id")
+    @XmlElement(name = "peer_id")
     String peerID;
 
-    @XmlElement (name = "peer_cidrs")
+    @XmlElement(name = "peer_cidrs")
     List<String> peerCidrs;
 
-    @XmlElement (name = "route_mode")
+    @XmlElement(name = "route_mode")
     String routeMode;
 
-    @XmlElement (name = "mtu")
+    @XmlElement(name = "mtu")
     Integer mtu;
 
-    @XmlElement (name = "auth_mode")
+    @XmlElement(name = "auth_mode")
     String authMode;
 
-    @XmlElement (name = "psk")
+    @XmlElement(name = "psk")
     String preSharedKey;
 
-    @XmlElement (name = "initiator")
+    @XmlElement(name = "initiator")
     String initiator;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (name = "ikepolicy_id")
+    @XmlElement(name = "ikepolicy_id")
     String ikePolicyID;
 
-    @XmlElement (name = "ipsecpolicy_id")
+    @XmlElement(name = "ipsecpolicy_id")
     String ipsecPolicyID;
 
-    @XmlElement (name = "vpnservice_id")
+    @XmlElement(name = "vpnservice_id")
     String vpnServiceID;
 
-    @XmlElement (name = "dpd")
+    @XmlElement(name = "dpd")
     NeutronVPNDeadPeerDetection deadPeerDetection;
 
     public NeutronVPNIPSECSiteConnection() {
@@ -144,7 +144,9 @@ public class NeutronVPNIPSECSiteConnection extends NeutronObject implements Seri
         this.initiator = initiator;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(boolean newValue) {
         adminStateUp = newValue;
@@ -257,10 +259,10 @@ public class NeutronVPNIPSECSiteConnection extends NeutronObject implements Seri
     @Override
     public String toString() {
         return "NeutronVPNIPSECSiteConnection{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
-                + name + '\'' + ", peerAddress=" + peerAddress + ", peerID='" + peerID
-                + '\'' + ", routeMode='" + routeMode + '\'' + ", mtu=" + mtu + ", authMode='" + authMode + '\''
-                + ", preSharedKey='" + preSharedKey + '\'' + ", initiator='" + initiator + '\'' + ", adminStateUp="
-                + adminStateUp + ", status='" + status + '\'' + ", ikePolicyID='" + ikePolicyID + '\''
-                + ", ipsecPolicyID='" + ipsecPolicyID + '\'' + ", vpnServiceID='" + vpnServiceID + '\'' + '}';
+                + name + '\'' + ", peerAddress=" + peerAddress + ", peerID='" + peerID + '\'' + ", routeMode='"
+                + routeMode + '\'' + ", mtu=" + mtu + ", authMode='" + authMode + '\'' + ", preSharedKey='"
+                + preSharedKey + '\'' + ", initiator='" + initiator + '\'' + ", adminStateUp=" + adminStateUp
+                + ", status='" + status + '\'' + ", ikePolicyID='" + ikePolicyID + '\'' + ", ipsecPolicyID='"
+                + ipsecPolicyID + '\'' + ", vpnServiceID='" + vpnServiceID + '\'' + '}';
     }
 }
index 879fe72890c4ac2a48f0644a9aada8f131150667..5f82affc8be44b5c340eda9f4f1cf5a15ab433c2 100644 (file)
@@ -22,10 +22,10 @@ public class NeutronVPNLifetime implements Serializable {
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "units")
+    @XmlElement(name = "units")
     String units;
 
-    @XmlElement (name = "value")
+    @XmlElement(name = "value")
     Integer value;
 
     public NeutronVPNLifetime() {
index 6926235109a5a59419fd078fe70d3f7a6960e8e1..432c994ece42ca486062d0d24710596d7bda56ea 100644 (file)
@@ -24,19 +24,19 @@ public class NeutronVPNService extends NeutronObject implements Serializable, IN
     // See OpenStack Network API v2.0 Reference for description of
     // annotated attributes
 
-    @XmlElement (name = "router_id")
+    @XmlElement(name = "router_id")
     String routerUUID;
 
-    @XmlElement (name = "status")
+    @XmlElement(name = "status")
     String status;
 
-    @XmlElement (name = "name")
+    @XmlElement(name = "name")
     String name;
 
-    @XmlElement (defaultValue = "true", name = "admin_state_up")
+    @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean adminStateUp;
 
-    @XmlElement (name = "subnet_id")
+    @XmlElement(name = "subnet_id")
     String subnetUUID;
 
     public NeutronVPNService() {
@@ -66,7 +66,9 @@ public class NeutronVPNService extends NeutronObject implements Serializable, IN
         this.name = name;
     }
 
-    public Boolean getAdminStateUp() { return adminStateUp; }
+    public Boolean getAdminStateUp() {
+        return adminStateUp;
+    }
 
     public void setAdminStateUp(boolean newValue) {
         adminStateUp = newValue;
index b2ae848e5ea57374ea3362d433575d99e1401eff..8638f4b980e1d9331086099de5e83f86c27c7654 100644 (file)
@@ -16,12 +16,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public class Neutron_ID implements Serializable {
     private static final long serialVersionUID = 1L;
-    private static final String UUID_PATTERN_REGEX = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$";
+    private static final String UUID_PATTERN_REGEX =
+            "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$";
     private static final Pattern UUID_PATTERN = Pattern.compile(UUID_PATTERN_REGEX);
 
     // See OpenStack Network API v2.0 Reference for description of
@@ -33,11 +33,11 @@ public class Neutron_ID implements Serializable {
     private void checkUuidPattern(String uuid) {
         Preconditions.checkNotNull(uuid, "Supplied value may not be null");
         Preconditions.checkArgument(UUID_PATTERN.matcher(uuid).matches(),
-                                    "Supplied value \"%s\" does not match uuid pattern \"%s\"",
-                                    uuid, UUID_PATTERN_REGEX);
+                "Supplied value \"%s\" does not match uuid pattern \"%s\"", uuid, UUID_PATTERN_REGEX);
     }
 
-    public Neutron_ID() { }
+    public Neutron_ID() {
+    }
 
     public Neutron_ID(String uuid) {
         checkUuidPattern(uuid);
index d43953fa5eececf85cd05a214bbfc310f82ade4e..982eeaa0ea3b8ea9b81ec1ac70f25e83726e591a 100644 (file)
@@ -14,7 +14,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public class Neutron_IPs implements Serializable {
@@ -29,7 +28,8 @@ public class Neutron_IPs implements Serializable {
     @XmlElement(name = "subnet_id")
     String subnetUUID;
 
-    public Neutron_IPs() { }
+    public Neutron_IPs() {
+    }
 
     public Neutron_IPs(String uuid) {
         subnetUUID = uuid;
@@ -53,8 +53,6 @@ public class Neutron_IPs implements Serializable {
 
     @Override
     public String toString() {
-        return "Neutron_IPs{" +
-               "ipAddress='" + ipAddress + '\'' +
-               ", subnetUUID='" + subnetUUID + '\'' + "}";
+        return "Neutron_IPs{" + "ipAddress='" + ipAddress + '\'' + ", subnetUUID='" + subnetUUID + '\'' + "}";
     }
 }
index d802d8288e46cc3d61cd3e6573f8fc39b8b9569e..909d6175d2daa8ff1a0c417bb17fd3414e111d1a 100644 (file)
@@ -38,7 +38,7 @@ public class JaxbTestHelper {
 
         Unmarshaller unmarshaller = jc.createUnmarshaller();
         unmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespacePrefixMapper);
-        
+
         StringReader reader = new StringReader(json);
         StreamSource stream = new StreamSource(reader);
         return unmarshaller.unmarshal(stream, c).getValue();
index 0ed93c4a252dc6d8bdcac6b4eaf359d45aabe813..026457743c68987b52ba24f4bdd10bcfb42c4255 100644 (file)
@@ -13,115 +13,130 @@ import org.junit.Test;
 
 public class NeutronFirewallJAXBTest {
 
-    private static final String NeutronFirewall_sourceJson="{ \"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", \"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", \"name\": \"jaxb-test\", \"description\": \"Test of NeutronFirewall JAXB\", \"admin_state_up\": false, \"status\": \"DOWN\", \"shared\": true, \"firewall_policy_id\": \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" }";
+    private static final String NeutronFirewall_sourceJson = "{ \"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", "
+            + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", \"name\": \"jaxb-test\", "
+            + "\"description\": \"Test of NeutronFirewall JAXB\", \"admin_state_up\": false, \"status\": \"DOWN\", "
+            + "\"shared\": true, \"firewall_policy_id\": \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" }";
 
     @Test
     public void test_NeutronFirewall_JAXB() {
         NeutronFirewall dummyObject = new NeutronFirewall();
         try {
-            NeutronFirewall testObject = (NeutronFirewall) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronFirewall_sourceJson);
+            NeutronFirewall testObject = (NeutronFirewall) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronFirewall_sourceJson);
             Assert.assertEquals("NeutronFirewall JAXB Test 1: Testing id failed",
-                  "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
+                    "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
 
             Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed",
-                  "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
+                    "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed",
-                  "jaxb-test", testObject.getFirewallName());
+            Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed", "jaxb-test",
+                    testObject.getFirewallName());
 
             Assert.assertFalse("NeutronFirewall JAXB Test 5: Testing admin_state_up failed",
-                  testObject.getFirewallAdminStateIsUp());
+                    testObject.getFirewallAdminStateIsUp());
 
-            Assert.assertTrue("NeutronFirewall JAXB Test 7: Testing shared failed",
-                  testObject.getFirewallIsShared());
+            Assert.assertTrue("NeutronFirewall JAXB Test 7: Testing shared failed", testObject.getFirewallIsShared());
 
             Assert.assertEquals("NeutronFirewall JAXB Test 8: Testing firewall_policy_id failed",
-                  "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallPolicyID());
+                    "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallPolicyID());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
     }
 
-    private static final String NeutronFirewallPolicy_sourceJson="{ \"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", \"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", \"name\": \"jaxb-test\", \"description\": \"Test of NeutronFirewallPolicy JAXB\", \"shared\": true, \"audited\": true, \"firewall_rules\": [ \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" ] }";
+    private static final String NeutronFirewallPolicy_sourceJson =
+            "{ \"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", "
+            + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", \"name\": \"jaxb-test\", "
+            + "\"description\": \"Test of NeutronFirewallPolicy JAXB\", \"shared\": true, \"audited\": true, "
+            + "\"firewall_rules\": [ \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" ] }";
 
     @Test
     public void test_NeutronFirewallPolicy_JAXB() {
         NeutronFirewallPolicy dummyObject = new NeutronFirewallPolicy();
         try {
-            NeutronFirewallPolicy testObject = (NeutronFirewallPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronFirewallPolicy_sourceJson);
+            NeutronFirewallPolicy testObject = (NeutronFirewallPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronFirewallPolicy_sourceJson);
             Assert.assertEquals("NeutronFirewallPolicy JAXB Test 1: Testing id failed",
-                  "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
+                    "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
 
             Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed",
-                  "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
+                    "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed",
-                  "jaxb-test", testObject.getFirewallPolicyName());
+            Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed", "jaxb-test",
+                    testObject.getFirewallPolicyName());
 
             Assert.assertTrue("NeutronFirewallPolicy JAXB Test 5: Testing shared failed",
-                  testObject.getFirewallPolicyIsShared());
+                    testObject.getFirewallPolicyIsShared());
 
             Assert.assertTrue("NeutronFirewallPolicy JAXB Test 6: Testing audited failed",
-                  testObject.getFirewallPolicyIsAudited());
+                    testObject.getFirewallPolicyIsAudited());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
     }
 
-    private static final String NeutronFirewallRule_sourceJson="{ \"action\": \"allow\", \"description\": \"Test of NeutronFirewallRule JAXB\", \"destination_ip_address\": \"10.10.10.10\", \"destination_port_range_min\": \"80\", \"destination_port_range_max\": \"81\", \"enabled\": true, \"firewall_policy_id\": \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\", \"id\": \"8722e0e0-9cc9-4490-9660-8c9a5732fbb0\", \"ip_version\": 4, \"name\": \"ALLOW_HTTP\", \"position\": 1, \"protocol\": \"tcp\", \"shared\": false, \"source_ip_address\": \"10.10.10.8\", \"source_port\": null, \"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" }";
+    private static final String NeutronFirewallRule_sourceJson = "{ \"action\": \"allow\", "
+            + "\"description\": \"Test of NeutronFirewallRule JAXB\", \"destination_ip_address\": \"10.10.10.10\", "
+            + "\"destination_port_range_min\": \"80\", \"destination_port_range_max\": \"81\", \"enabled\": true, "
+            + "\"firewall_policy_id\": \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\", "
+            + "\"id\": \"8722e0e0-9cc9-4490-9660-8c9a5732fbb0\", \"ip_version\": 4, \"name\": \"ALLOW_HTTP\", "
+            + "\"position\": 1, \"protocol\": \"tcp\", \"shared\": false, \"source_ip_address\": \"10.10.10.8\", "
+            + "\"source_port\": null, \"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" }";
 
     @Test
     public void test_NeutronFirewallRule_JAXB() {
         NeutronFirewallRule dummyObject = new NeutronFirewallRule();
         try {
-            NeutronFirewallRule testObject = (NeutronFirewallRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronFirewallRule_sourceJson);
+            NeutronFirewallRule testObject = (NeutronFirewallRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronFirewallRule_sourceJson);
             Assert.assertEquals("NeutronFirewallRule JAXB Test 1: Testing id failed",
-                  "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID());
+                    "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID());
 
             Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed",
-                  "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
+                    "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed",
-                  "ALLOW_HTTP", testObject.getFirewallRuleName());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed", "ALLOW_HTTP",
+                    testObject.getFirewallRuleName());
 
             Assert.assertEquals("NeutronFirewallRule JAXB Test 5: Testing firewaulPolicyRuleID failed",
-                  "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallRulePolicyID());
+                    "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallRulePolicyID());
 
             Assert.assertFalse("NeutronFirewallRule JAXB Test 6: Testing shared failed",
-                  testObject.getFirewallRuleIsShared());
+                    testObject.getFirewallRuleIsShared());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 7: Testing protocol failed",
-                  "tcp", testObject.getFirewallRuleProtocol());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 7: Testing protocol failed", "tcp",
+                    testObject.getFirewallRuleProtocol());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 8: Testing IP version failed",
-                  new Integer(4), testObject.getFirewallRuleIpVer());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 8: Testing IP version failed", new Integer(4),
+                    testObject.getFirewallRuleIpVer());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 9: Testing source IP address failed",
-                  "10.10.10.8", testObject.getFirewallRuleSrcIpAddr());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 9: Testing source IP address failed", "10.10.10.8",
+                    testObject.getFirewallRuleSrcIpAddr());
 
             Assert.assertEquals("NeutronFirewallRule JAXB Test 10: Testing destination IP address failed",
-                  "10.10.10.10", testObject.getFirewallRuleDstIpAddr());
+                    "10.10.10.10", testObject.getFirewallRuleDstIpAddr());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 11.1: Testing source port min failed",
-                  null, testObject.getFirewallRuleSrcPortRangeMin());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 11.1: Testing source port min failed", null,
+                    testObject.getFirewallRuleSrcPortRangeMin());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 11.2: Testing source port failed",
-                  null, testObject.getFirewallRuleSrcPortRangeMax());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 11.2: Testing source port failed", null,
+                    testObject.getFirewallRuleSrcPortRangeMax());
 
             Assert.assertEquals("NeutronFirewallRule JAXB Test 12.1: Testing destination port min failed",
-                  new Integer(80), testObject.getFirewallRuleDstPortRangeMin());
+                    new Integer(80), testObject.getFirewallRuleDstPortRangeMin());
 
             Assert.assertEquals("NeutronFirewallRule JAXB Test 12.2: Testing destination port max failed",
-                  new Integer(81), testObject.getFirewallRuleDstPortRangeMax());
+                    new Integer(81), testObject.getFirewallRuleDstPortRangeMax());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 13: Testing position failed",
-                  new Integer(1), testObject.getFirewallRulePosition());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 13: Testing position failed", new Integer(1),
+                    testObject.getFirewallRulePosition());
 
-            Assert.assertEquals("NeutronFirewallRule JAXB Test 14: Testing action",
-                  "allow", testObject.getFirewallRuleAction());
+            Assert.assertEquals("NeutronFirewallRule JAXB Test 14: Testing action", "allow",
+                    testObject.getFirewallRuleAction());
 
             Assert.assertTrue("NeutronFirewallRule JAXB Test 15: Testing enabled failed",
-                  testObject.getFirewallRuleIsEnabled());
+                    testObject.getFirewallRuleIsEnabled());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
index deddc391a49d3687977cfe82d7622b242d0e757c..8cf67bd786e8fca1eceaad0109356678a880c8ce 100644 (file)
@@ -13,44 +13,43 @@ import org.junit.Test;
 
 public class NeutronFloatingIPJAXBTest {
 
-    private static final String NeutronFloatingIP_sourceJson="{" +
-        "\"fixed_ip_address\": \"10.0.0.3\", " +
-        "\"floating_ip_address\": \"172.24.4.228\", " +
-        "\"floating_network_id\": \"376da547-b977-4cfe-9cba-275c80debf57\", " +
-        "\"id\": \"2f245a7b-796b-4f26-9cf9-9e82d248fda7\", " +
-        "\"port_id\": \"ce705c24-c1ef-408a-bda3-7bbd946164ab\", " +
-        "\"router_id\": \"d23abc8d-2991-4a55-ba98-2aaea84cc72f\", " +
-        "\"status\": \"ACTIVE\", " +
-        "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\" }";
+    private static final String NeutronFloatingIP_sourceJson = "{" + "\"fixed_ip_address\": \"10.0.0.3\", "
+            + "\"floating_ip_address\": \"172.24.4.228\", "
+            + "\"floating_network_id\": \"376da547-b977-4cfe-9cba-275c80debf57\", "
+            + "\"id\": \"2f245a7b-796b-4f26-9cf9-9e82d248fda7\", "
+            + "\"port_id\": \"ce705c24-c1ef-408a-bda3-7bbd946164ab\", "
+            + "\"router_id\": \"d23abc8d-2991-4a55-ba98-2aaea84cc72f\", " + "\"status\": \"ACTIVE\", "
+            + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\" }";
 
     @Test
     public void test_NeutronFloatingIP_JAXB() {
         NeutronFloatingIP dummyObject = new NeutronFloatingIP();
         try {
-            NeutronFloatingIP testObject = (NeutronFloatingIP) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronFloatingIP_sourceJson);
+            NeutronFloatingIP testObject = (NeutronFloatingIP) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronFloatingIP_sourceJson);
             Assert.assertEquals("NeutronFloatingIP JAXB Test 1: Testing id failed",
-                  "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
+                    "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 
             Assert.assertEquals("NeutronFloatingIP JAXB Test 2: Testing tenant_id failed",
-                  "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
+                    "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
 
             Assert.assertEquals("NeutronFloatingIP JAXB Test 3: Testing router id failed",
-                  "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID());
+                    "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID());
 
             Assert.assertEquals("NeutronFloatingIP JAXB Test 4: Testing port id failed",
-                  "ce705c24-c1ef-408a-bda3-7bbd946164ab", testObject.getPortUUID());
+                    "ce705c24-c1ef-408a-bda3-7bbd946164ab", testObject.getPortUUID());
 
             Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing floating network id failed",
-                  "376da547-b977-4cfe-9cba-275c80debf57", testObject.getFloatingNetworkUUID());
+                    "376da547-b977-4cfe-9cba-275c80debf57", testObject.getFloatingNetworkUUID());
 
-            Assert.assertEquals("NeutronFloatingIP JAXB Test 6: Testing floating ip address failed",
-                  "172.24.4.228", testObject.getFloatingIPAddress());
+            Assert.assertEquals("NeutronFloatingIP JAXB Test 6: Testing floating ip address failed", "172.24.4.228",
+                    testObject.getFloatingIPAddress());
 
-            Assert.assertEquals("NeutronFloatingIP JAXB Test 7: Testing fixed ip address failed",
-                   "10.0.0.3", testObject.getFixedIPAddress());
+            Assert.assertEquals("NeutronFloatingIP JAXB Test 7: Testing fixed ip address failed", "10.0.0.3",
+                    testObject.getFixedIPAddress());
 
-            Assert.assertEquals("NeutronFloatingIP JAXB Test 8: Testing status failed",
-                  "ACTIVE", testObject.getStatus());
+            Assert.assertEquals("NeutronFloatingIP JAXB Test 8: Testing status failed", "ACTIVE",
+                    testObject.getStatus());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
index 7e09141310581616e032ca01a3ed7fb664bdaa60..1f751241541b2b84afa16f277c057827ca95617d 100644 (file)
@@ -18,8 +18,8 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest {
     private static final String NeutronLoadBalancerHealthMonitor_sourceJson = "{"
             + "\"id\": \"2f245a7b-796b-4f26-9cf9-9e82d248fda7\", " + "\"type\": \"HTTP\", " + "\"delay\": 1, "
             + "\"timeout\": 1, " + "\"admin_state_up\": \"false\", " + "\"max_retries\": 5, "
-            + "\"http_method\": \"get\", " + "\"url_path\": \"/index.html\", "
-            + "\"expected_codes\": \"200,201,202\", " + "\"tenant_id\": \"00045a7b-796b-4f26-9cf9-9e82d248fda7\" }";
+            + "\"http_method\": \"get\", " + "\"url_path\": \"/index.html\", " + "\"expected_codes\": \"200,201,202\", "
+            + "\"tenant_id\": \"00045a7b-796b-4f26-9cf9-9e82d248fda7\" }";
 
     @Test
     public void test_NeutronLoadBalancerHealthMonitor_JAXB() {
@@ -48,8 +48,8 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest {
             Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 7: Testing  http_methods failed", "get",
                     testObject.getLoadBalancerHealthMonitorHttpMethod());
 
-            Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 8: Testing  url_path failed",
-                    "/index.html", testObject.getLoadBalancerHealthMonitorUrlPath());
+            Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 8: Testing  url_path failed", "/index.html",
+                    testObject.getLoadBalancerHealthMonitorUrlPath());
 
             Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 9: Testing  expected_codes failed",
                     "200,201,202", testObject.getLoadBalancerHealthMonitorExpectedCodes());
@@ -63,8 +63,8 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest {
             loadBalancerHealthMonitorPool.add(neutron_id);
             testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool);
             Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed",
-                    "2f245a7b-0000-4f26-9cf9-9e82d248fda7", testObject.getLoadBalancerHealthMonitorPools().get(0)
-                            .getID());
+                    "2f245a7b-0000-4f26-9cf9-9e82d248fda7",
+                    testObject.getLoadBalancerHealthMonitorPools().get(0).getID());
         } catch (Exception e) {
             Assert.assertFalse("Tests Failed", true);
         }
index b686bf84a64990b1b4bbcc4fd76809edb3fdadf0..f39a83e69106415bcb65dd199233f9a4e03e8335 100644 (file)
@@ -26,13 +26,12 @@ public class NeutronLoadBalancerListenerJAXBTest {
     public void test_NeutronLoadBalancerListener_JAXB() {
         NeutronLoadBalancerListener dummyObject = new NeutronLoadBalancerListener();
         try {
-            NeutronLoadBalancerListener testObject = (NeutronLoadBalancerListener) JaxbTestHelper.jaxbUnmarshall(
-                    dummyObject, NeutronLoadBalancerListener_sourceJson);
+            NeutronLoadBalancerListener testObject = (NeutronLoadBalancerListener) JaxbTestHelper
+                    .jaxbUnmarshall(dummyObject, NeutronLoadBalancerListener_sourceJson);
             Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 1: Testing id failed",
                     "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 
-            Assert.assertEquals(
-                    "NeutronLoadBalancerListener JAXB Test 2: Testing LoadBalancer defaulti pool ID failed",
+            Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 2: Testing LoadBalancer defaulti pool ID failed",
                     "00005a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerListenerDefaultPoolID());
 
             Assert.assertEquals(
@@ -62,8 +61,8 @@ public class NeutronLoadBalancerListenerJAXBTest {
             neutronLoadBalancerListenerLoadBalancerIDs.add(neutron_id);
             testObject.setNeutronLoadBalancerListenerLoadBalancerIDs(neutronLoadBalancerListenerLoadBalancerIDs);
             Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 10: Testing LoadBalancerIDs failed",
-                    "2f245a7b-0000-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerListenerLoadBalancerIDs()
-                            .get(0).getID());
+                    "2f245a7b-0000-4f26-9cf9-9e82d248fda7",
+                    testObject.getNeutronLoadBalancerListenerLoadBalancerIDs().get(0).getID());
         } catch (Exception e) {
             Assert.assertFalse("Tests Failed", true);
         }
index bfc619fd6b1031f1f1b00d03226f082ba626e2ff..3ab2d8f8b36468efe0d887833aeeb9c6c0e08c12 100644 (file)
@@ -14,26 +14,13 @@ import org.junit.Test;
 
 public class NeutronLoadBalancerPoolJAXBTest {
 
-    private static final String NeutronLoadBalancerPool_sourceJson = "{ " +
-        "\"admin_state_up\": true, " +
-        "\"description\": \"simple pool\", " +
-        "\"healthmonitor_id\": \"00066a7b-796b-4f26-9cf9-9e82d248fda7\", " +
-        "\"id\": \"12ff63af-4127-4074-a251-bcb2ecc53ebe\", " +
-        "\"lb_algorithm\": \"ROUND_ROBIN\", " +
-        "\"listeners\": [ " +
-        "{ " +
-        "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\" " +
-        "} " +
-        "], " +
-        "\"members\": [], " +
-        "\"name\": \"pool1\", " +
-        "\"protocol\": \"HTTP\", " +
-        "\"session_persistence\": { " +
-        "\"cookie_name\": \"my_cookie\", " +
-        "\"type\": \"APP_COOKIE\" " +
-        "}, " +
-        "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" " +
-        "} ";
+    private static final String NeutronLoadBalancerPool_sourceJson = "{ " + "\"admin_state_up\": true, "
+            + "\"description\": \"simple pool\", " + "\"healthmonitor_id\": \"00066a7b-796b-4f26-9cf9-9e82d248fda7\", "
+            + "\"id\": \"12ff63af-4127-4074-a251-bcb2ecc53ebe\", " + "\"lb_algorithm\": \"ROUND_ROBIN\", "
+            + "\"listeners\": [ " + "{ " + "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\" " + "} " + "], "
+            + "\"members\": [], " + "\"name\": \"pool1\", " + "\"protocol\": \"HTTP\", " + "\"session_persistence\": { "
+            + "\"cookie_name\": \"my_cookie\", " + "\"type\": \"APP_COOKIE\" " + "}, "
+            + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" " + "} ";
 
     @Test
     public void test_NeutronLoadBalancerPool_JAXB() {
@@ -63,15 +50,15 @@ public class NeutronLoadBalancerPoolJAXBTest {
                     "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID());
 
             List<Neutron_ID> testListeners = testObject.getLoadBalancerPoolListeners();
-            Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed",
-                    1, testListeners.size());
+            Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1,
+                    testListeners.size());
 
             Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.2: Testing Listeners failed",
                     "39de4d56-d663-46e5-85a1-5b9d5fa17829", testObject.getLoadBalancerPoolListeners().get(0).getID());
 
             List<NeutronLoadBalancerPoolMember> testMembers = testObject.getLoadBalancerPoolMembers();
-            Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 10.1: Testing Listeners failed",
-                    0, testMembers.size());
+            Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 10.1: Testing Listeners failed", 0,
+                    testMembers.size());
 
             Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 11: Testing session_persistence cookie_name failed",
                     "my_cookie", testObject.getLoadBalancerPoolSessionPersistence().getCookieName());
index bbeb13038859a40a3e4aebe92178926c50c05f17..edfca1c6aefb10438877254baf3d46dfa5901845 100644 (file)
@@ -23,8 +23,8 @@ public class NeutronLoadBalancerPoolMemberJAXBTest {
     public void test_NeutronLoadBalancerPoolMember_JAXB() {
         NeutronLoadBalancerPoolMember dummyObject = new NeutronLoadBalancerPoolMember();
         try {
-            NeutronLoadBalancerPoolMember testObject = (NeutronLoadBalancerPoolMember) JaxbTestHelper.jaxbUnmarshall(
-                    dummyObject, NeutronLoadBalancerPoolMember_sourceJson);
+            NeutronLoadBalancerPoolMember testObject = (NeutronLoadBalancerPoolMember) JaxbTestHelper
+                    .jaxbUnmarshall(dummyObject, NeutronLoadBalancerPoolMember_sourceJson);
             Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 1: Testing id failed",
                     "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 
index ed7e7a5d376a8a0b1fcdb52b4237f8ce4d930188..71a0e7162b138663932f431ee860ca68fe709bd7 100644 (file)
@@ -13,9 +13,8 @@ import org.junit.Test;
 
 public class NeutronLoadBalancer_SessionPersistenceJAXBTest {
 
-    private static final String NeutronLoadBalancer_SessionPersistence_sourceJson = "{ " +
-        "\"cookie_name\": \"NeutronLoadBalancer_SessionPersistence_Cookie\", " +
-        "\"type\": \"HTTP_COOKIE\" }";
+    private static final String NeutronLoadBalancer_SessionPersistence_sourceJson = "{ "
+            + "\"cookie_name\": \"NeutronLoadBalancer_SessionPersistence_Cookie\", " + "\"type\": \"HTTP_COOKIE\" }";
 
     @Test
     public void test_NeutronLoadBalancer_SessionPersistence_JAXB() {
index 14d071f92372c8fa83a2bbba60ff82822ae5dc4e..0d0e7e7e4a98bb0f4d3ece3b8cb728f1aedd47b9 100644 (file)
@@ -22,8 +22,8 @@ public class NeutronMeteringLabelRuleJAXBTest {
     public void test_NeutronMeteringLabelRule_JAXB() {
         NeutronMeteringLabelRule meteringObject = new NeutronMeteringLabelRule();
         try {
-            NeutronMeteringLabelRule testObject = (NeutronMeteringLabelRule) JaxbTestHelper.jaxbUnmarshall(
-                    meteringObject, NeutronMeteringLabelRule_sourceJson);
+            NeutronMeteringLabelRule testObject = (NeutronMeteringLabelRule) JaxbTestHelper
+                    .jaxbUnmarshall(meteringObject, NeutronMeteringLabelRule_sourceJson);
             Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 1: Testing metering_label_id failed",
                     "e131d186-b02d-4c0b-83d5-0c0725c4f812", testObject.getMeteringLabelRuleLabelID());
 
index 1cc15659430908142a9a9aa6365d88f0959a12a3..228ca10aabbbd5ab17bfaf23477d21176e78701d 100644 (file)
@@ -14,167 +14,143 @@ import org.junit.Test;
 
 public class NeutronNetworkJAXBTest {
 
-    private static final String NeutronNetwork_SingleProvider_sourceJson="{ " +
-         "\"status\": \"ACTIVE\", " +
-        "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " +
-        "\"name\": \"net1\", " +
-        "\"admin_state_up\": true, " +
-        "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", " +
-        "\"router:external\": false, " +
-        "\"provider:segmentation_id\": \"2\", " +
-        "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", " +
-        "\"provider:network_type\": \"vlan\", " +
-        "\"shared\": false, " +
-        "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
+    private static final String NeutronNetwork_SingleProvider_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " + "\"name\": \"net1\", "
+            + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
+            + "\"router:external\": false, " + "\"provider:segmentation_id\": \"2\", "
+            + "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
+            + "\"provider:network_type\": \"vlan\", " + "\"shared\": false, "
+            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronNetwork_SingleProvider_JAXB() {
         NeutronNetwork dummyObject = new NeutronNetwork();
         try {
-            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronNetwork_SingleProvider_sourceJson);
-            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed",
-                  "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID());
+            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronNetwork_SingleProvider_sourceJson);
+            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
+                    testObject.getID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                  "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
+                    "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed",
-                  "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork());
+                    "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed",
-                  "ACTIVE", testObject.getStatus());
+            Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed",
-                                "net1", testObject.getNetworkName());
+            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed",
-                  true, testObject.getAdminStateUp());
+            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true,
+                    testObject.getAdminStateUp());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed",
-                  false, testObject.getRouterExternal());
+            Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed", false,
+                    testObject.getRouterExternal());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed",
-                  "2", testObject.getProviderSegmentationID());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed", "2",
+                    testObject.getProviderSegmentationID());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed",
-                  "vlan", testObject.getProviderNetworkType());
+            Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed", "vlan",
+                    testObject.getProviderNetworkType());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed",
-                  false, testObject.getShared());
+            Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed", false, testObject.getShared());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
     }
 
-    private static final String NeutronNetwork_MultipleProvider_sourceJson="{" +
-        "\"status\": \"ACTIVE\", " +
-        "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " +
-        "\"name\": \"net1\", " +
-        "\"admin_state_up\": true, " +
-        "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", " +
-        "\"router:external\": false, " +
-        "\"segments\": [ { " +
-            "\"provider:segmentation_id\": \"2\", " +
-            "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", " +
-            "\"provider:network_type\": \"vlan\" }, " +
-        "{ \"provider:segmentation_id\": null, " +
-            "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50454\", " +
-            "\"provider:network_type\": \"stt\" } ], " +
-        "\"shared\": false, " +
-        "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
+    private static final String NeutronNetwork_MultipleProvider_sourceJson = "{" + "\"status\": \"ACTIVE\", "
+            + "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " + "\"name\": \"net1\", "
+            + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
+            + "\"router:external\": false, " + "\"segments\": [ { " + "\"provider:segmentation_id\": \"2\", "
+            + "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
+            + "\"provider:network_type\": \"vlan\" }, " + "{ \"provider:segmentation_id\": null, "
+            + "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50454\", "
+            + "\"provider:network_type\": \"stt\" } ], " + "\"shared\": false, "
+            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronNetwork_MultipleProvider_JAXB() {
         NeutronNetwork dummyObject = new NeutronNetwork();
         try {
-            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronNetwork_MultipleProvider_sourceJson);
-            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed",
-                  "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID());
+            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronNetwork_MultipleProvider_sourceJson);
+            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
+                    testObject.getID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                  "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
+                    "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed",
-                  "ACTIVE", testObject.getStatus());
+            Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed", "ACTIVE", testObject.getStatus());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed",
-                                "net1", testObject.getNetworkName());
+            Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getNetworkName());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing admin state up failed",
-                  true, testObject.getAdminStateUp());
+            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing admin state up failed", true,
+                    testObject.getAdminStateUp());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing router external failed",
-                  false, testObject.getRouterExternal());
+            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing router external failed", false,
+                    testObject.getRouterExternal());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed",
-                  false, testObject.getShared());
+            Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed", false, testObject.getShared());
 
             List<NeutronNetwork_Segment> segments = testObject.getSegments();
-            Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed",
-                  2, segments.size());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed", 2,
+                    segments.size());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 9.2: Testing segment index 0 segmentation id failed",
-                                "2", segments.get(0).getProviderSegmentationID());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9.2: Testing segment index 0 segmentation id failed", "2",
+                    segments.get(0).getProviderSegmentationID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 0 physical network failed",
-                                "8bab8453-1bc9-45af-8c70-f83aa9b50453", segments.get(0).getProviderPhysicalNetwork());
+                    "8bab8453-1bc9-45af-8c70-f83aa9b50453", segments.get(0).getProviderPhysicalNetwork());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 0 network type failed",
-                                "vlan", segments.get(0).getProviderNetworkType());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 0 network type failed", "vlan",
+                    segments.get(0).getProviderNetworkType());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 9.5: Testing segment index 1 segmentation id failed",
-                                null, segments.get(1).getProviderSegmentationID());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9.5: Testing segment index 1 segmentation id failed", null,
+                    segments.get(1).getProviderSegmentationID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 1 physical network failed",
-                                "8bab8453-1bc9-45af-8c70-f83aa9b50454", segments.get(1).getProviderPhysicalNetwork());
+                    "8bab8453-1bc9-45af-8c70-f83aa9b50454", segments.get(1).getProviderPhysicalNetwork());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 1 network type failed",
-                                "stt", segments.get(1).getProviderNetworkType());
+            Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 1 network type failed", "stt",
+                    segments.get(1).getProviderNetworkType());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
     }
 
-    private static final String NeutronNetwork_L3_HA_sourceJson="{" +
-            "\"name\": \"HA network tenant c15340eb65804b20af2dd0fd3beddc8c\", " +
-            "\"provider:physical_network\": null, " +
-            "\"admin_state_up\": true, " +
-            "\"tenant_id\": \"\", " +
-            "\"mtu\": 0, " +
-            "\"router:external\": false, " +
-            "\"shared\": false, " +
-            "\"vlan_transparent\": null, " +
-            "\"port_security_enabled\": true, " +
-            "\"provider:network_type\": \"vxlan\", " +
-            "\"id\": \"d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e\", " +
-            "\"provider:segmentation_id\": 1018 " + "}";
+    private static final String NeutronNetwork_L3_HA_sourceJson = "{"
+            + "\"name\": \"HA network tenant c15340eb65804b20af2dd0fd3beddc8c\", "
+            + "\"provider:physical_network\": null, " + "\"admin_state_up\": true, " + "\"tenant_id\": \"\", "
+            + "\"mtu\": 0, " + "\"router:external\": false, " + "\"shared\": false, " + "\"vlan_transparent\": null, "
+            + "\"port_security_enabled\": true, " + "\"provider:network_type\": \"vxlan\", "
+            + "\"id\": \"d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e\", " + "\"provider:segmentation_id\": 1018 " + "}";
 
     @Test
     public void test_NeutronNetwork_L3_HA_JAXB() {
         NeutronNetwork dummyObject = new NeutronNetwork();
         try {
-            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronNetwork_L3_HA_sourceJson);
-            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed",
-                    "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e", testObject.getID());
+            NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronNetwork_L3_HA_sourceJson);
+            Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e",
+                    testObject.getID());
 
             // Bug 4775: tenantId is null when json provides it as empty string
-            Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                    testObject.getTenantID());
+            Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID());
 
             Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing name failed",
                     "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getNetworkName());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing admin state up failed",
-                    true, testObject.getAdminStateUp());
+            Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing admin state up failed", true,
+                    testObject.getAdminStateUp());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing router external failed",
-                    false, testObject.getRouterExternal());
+            Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing router external failed", false,
+                    testObject.getRouterExternal());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing shared failed",
-                    false, testObject.getShared());
+            Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing shared failed", false, testObject.getShared());
 
-            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing provider segmentation id failed",
-                    "1018", testObject.getProviderSegmentationID());
+            Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing provider segmentation id failed", "1018",
+                    testObject.getProviderSegmentationID());
         } catch (Exception e) {
             Assert.assertTrue("Tests failed", false);
         }
index d6b4c365e08a19665e5aa31e04fa8fa3f7af54b7..9482a025e2ed9ad24f4d9a0f3c6314df625245c3 100644 (file)
@@ -12,19 +12,14 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronNetworkQosJAXBTest {
-    private static final String NeutronNetworkQosEnabled_sourceJson="{ " +
-            "\"status\": \"ACTIVE\", " +
-            "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " +
-            "\"name\": \"net1\", " +
-            "\"admin_state_up\": true, " +
-            "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", " +
-            "\"router:external\": false, " +
-            "\"provider:segmentation_id\": \"2\", " +
-            "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", " +
-            "\"provider:network_type\": \"vlan\", " +
-            "\"shared\": false, " +
-            "\"qos_policy_id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", " +
-            "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
+    private static final String NeutronNetworkQosEnabled_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " + "\"name\": \"net1\", "
+            + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
+            + "\"router:external\": false, " + "\"provider:segmentation_id\": \"2\", "
+            + "\"provider:physical_network\": \"8bab8453-1bc9-45af-8c70-f83aa9b50453\", "
+            + "\"provider:network_type\": \"vlan\", " + "\"shared\": false, "
+            + "\"qos_policy_id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\", "
+            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronNetworkQos_JAXB() throws JAXBException {
@@ -32,35 +27,32 @@ public class NeutronNetworkQosJAXBTest {
 
         NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
                 NeutronNetworkQosEnabled_sourceJson);
-        Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed",
-                "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID());
+        Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
+                testObject.getID());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
+        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                testObject.getTenantID());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed",
                 "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed",
-                "ACTIVE", testObject.getStatus());
+        Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed",
-                "net1", testObject.getNetworkName());
+        Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed",
-                true, testObject.getAdminStateUp());
+        Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true,
+                testObject.getAdminStateUp());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed",
-                false, testObject.getRouterExternal());
+        Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed", false,
+                testObject.getRouterExternal());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed",
-                "2", testObject.getProviderSegmentationID());
+        Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed", "2",
+                testObject.getProviderSegmentationID());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed",
-                "vlan", testObject.getProviderNetworkType());
+        Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed", "vlan",
+                testObject.getProviderNetworkType());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed",
-                false, testObject.getShared());
+        Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed", false, testObject.getShared());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 12: Testing qos_policy_id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getQosPolicyId());
index 3fecff2261a21d053df56ade34cfb443a55ef30f..bb4f2ecbffb5a9af5557d9b994561764517d2517 100644 (file)
@@ -13,10 +13,8 @@ import org.junit.Test;
 
 public class NeutronNetwork_SegmentJAXBTest {
 
-    private static final String NeutronNetwork_Segment_sourceJson = "{ "
-            + "\"provider:network_type\": \"vlan\", "
-            + "\"provider:physical_network\": \"physnet1\", "
-            + "\"provider:segmentation_id\": \"1001\" }";
+    private static final String NeutronNetwork_Segment_sourceJson = "{ " + "\"provider:network_type\": \"vlan\", "
+            + "\"provider:physical_network\": \"physnet1\", " + "\"provider:segmentation_id\": \"1001\" }";
 
     @Test
     public void test_NeutronNetwork_Segment_JAXB() {
index 207ae30e0d0ad0c434ea6dcbadb003c79cc5e98e..08ecd09a5f53f235528bb00d0fc61b9a904704b7 100644 (file)
@@ -15,12 +15,10 @@ import org.junit.Test;
 
 public class NeutronPortJAXBTest {
 
-    private static final String NeutronPort_sourceJson = "{ "
-            + "\"status\": \"ACTIVE\", "
-            + "\"name\": \"net1\", "
-            + "\"admin_state_up\": true, "
-            + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
-            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
+    private static final String NeutronPort_sourceJson = "{ " + "\"status\": \"ACTIVE\", " + "\"name\": \"net1\", "
+            + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
+            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
             + "\"binding:vif_details\": {\"port_filter\": \"true\" , \"ovs_hybrid_plug\": \"false\" }, "
             + "\"extra_dhcp_opts\": [\"\"], " + "\"security_groups\": [\"\"], " + "\"allowed_address_pairs\": [\"\"], "
             + "\"device_id\": \"257614cc-e178-4c92-9c61-3b28d40eca44\", " + "\"device_owner\": \"\", "
@@ -37,8 +35,8 @@ public class NeutronPortJAXBTest {
             Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                     neutronObject.getID());
 
-            Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed",
-                    "9bacb3c5d39d41a79512987f338cf177", neutronObject.getTenantID());
+            Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                    neutronObject.getTenantID());
 
             Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed",
                     "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID());
index 1289f9a543172d1592a11d00ffdd767322ce5f82..37ef557f5f831daa7c0d6ed23af8da87ef4f7c21 100644 (file)
@@ -16,12 +16,11 @@ import org.junit.Test;
 
 public class NeutronPortQosJAXBTest {
 
-    private static final String NeutronPortQosEnabled_sourceJson = "{ "
-            + "\"status\": \"ACTIVE\", "
-            + "\"name\": \"net1\", "
-            + "\"admin_state_up\": true, "
+    private static final String NeutronPortQosEnabled_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"name\": \"net1\", " + "\"admin_state_up\": true, "
             + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
-            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
+            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
             + "\"binding:vif_details\": {\"port_filter\": \"true\" , \"ovs_hybrid_plug\": \"false\" }, "
             + "\"extra_dhcp_opts\": [\"\"], " + "\"security_groups\": [\"\"], " + "\"allowed_address_pairs\": [\"\"], "
             + "\"device_id\": \"257614cc-e178-4c92-9c61-3b28d40eca44\", " + "\"device_owner\": \"\", "
@@ -35,12 +34,13 @@ public class NeutronPortQosJAXBTest {
     public void test_PortQosEnabled_JAXB() throws JAXBException {
         NeutronPort testObject = new NeutronPort();
 
-        NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, NeutronPortQosEnabled_sourceJson);
+        NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronPortQosEnabled_sourceJson);
         Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());
 
-        Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed",
-                "9bacb3c5d39d41a79512987f338cf177", neutronObject.getTenantID());
+        Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                neutronObject.getTenantID());
 
         Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed",
                 "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID());
@@ -70,8 +70,7 @@ public class NeutronPortQosJAXBTest {
                 allowedAddressPairs.size());
 
         Map<String, String> vifDetails = neutronObject.getVIFDetails();
-        Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2,
-                vifDetails.size());
+        Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2, vifDetails.size());
 
         Assert.assertEquals("NeutronPort JAXB Test 9.2: Testing port_filter value failed", "true",
                 vifDetails.get("port_filter"));
@@ -102,7 +101,7 @@ public class NeutronPortQosJAXBTest {
         Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:host_id failed", "",
                 neutronObject.getBindinghostID());
 
-        Assert.assertEquals("NeutronPort JAXB Test 18: Testing qos_policy_id failed", "d6220bbb-35f3-48ab-8eae-69c60aef3546",
-                neutronObject.getQosPolicyId());
+        Assert.assertEquals("NeutronPort JAXB Test 18: Testing qos_policy_id failed",
+                "d6220bbb-35f3-48ab-8eae-69c60aef3546", neutronObject.getQosPolicyId());
     }
 }
index cd4bfc649af71347ca35829afc2a2e791a89d368..8cec249c2c8eed7c8fca37bf958122c495a53c7d 100644 (file)
@@ -16,45 +16,39 @@ import org.junit.Test;
 public class NeutronPortSecurityJAXBTest {
 
     // JSON with PortSecurityEnabled set true
-    private static final String portSecurityEnabled_sourceJson = "{ "
-            + "\"status\": \"ACTIVE\", "
-            + "\"name\": \"net1\", "
-            + "\"admin_state_up\": true, "
+    private static final String portSecurityEnabled_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"name\": \"net1\", " + "\"admin_state_up\": true, "
             + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
-            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
+            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
             + "\"binding:vif_details\": {\"port_filter\": \"true\" , \"ovs_hybrid_plug\": \"false\" }, "
             + "\"extra_dhcp_opts\": [\"\"], " + "\"security_groups\": [\"\"], " + "\"allowed_address_pairs\": [\"\"], "
             + "\"device_id\": \"257614cc-e178-4c92-9c61-3b28d40eca44\", " + "\"device_owner\": \"\", "
             + "\"binding:host_id\": \"\", " + "\"binding:vif_type\": \"unbound\", "
             + "\"binding:vnic_type\": \"normal\", " + "\"mac_address\": \"fa:16:3e:c9:cb:f0\", "
             + "\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f5\", "
-            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"port_security_enabled\": true }";
-
+            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\", " + "\"port_security_enabled\": true }";
 
     // JSON with PortSecurityEnabled set false
-    private static final String portSecurityDisabled_sourceJson = "{ "
-            + "\"status\": \"ACTIVE\", "
-            + "\"name\": \"net1\", "
-            + "\"admin_state_up\": true, "
+    private static final String portSecurityDisabled_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"name\": \"net1\", " + "\"admin_state_up\": true, "
             + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
-            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
+            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
             + "\"binding:vif_details\": {\"port_filter\": \"true\" , \"ovs_hybrid_plug\": \"false\" }, "
             + "\"extra_dhcp_opts\": [\"\"], " + "\"security_groups\": [\"\"], " + "\"allowed_address_pairs\": [\"\"], "
             + "\"device_id\": \"257614cc-e178-4c92-9c61-3b28d40eca44\", " + "\"device_owner\": \"\", "
             + "\"binding:host_id\": \"\", " + "\"binding:vif_type\": \"unbound\", "
             + "\"binding:vnic_type\": \"normal\", " + "\"mac_address\": \"fa:16:3e:c9:cb:f0\", "
             + "\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f5\", "
-            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"port_security_enabled\": false }";
+            + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\", " + "\"port_security_enabled\": false }";
 
     // JSON with PortSecurityEnabled not set for compatibility test
-    private static final String portSecurityDefault_sourceJson = "{ "
-            + "\"status\": \"ACTIVE\", "
-            + "\"name\": \"net1\", "
-            + "\"admin_state_up\": true, "
+    private static final String portSecurityDefault_sourceJson = "{ " + "\"status\": \"ACTIVE\", "
+            + "\"name\": \"net1\", " + "\"admin_state_up\": true, "
             + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
-            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
+            + "\"fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ],"
             + "\"binding:vif_details\": {\"port_filter\": \"true\" , \"ovs_hybrid_plug\": \"false\" }, "
             + "\"extra_dhcp_opts\": [\"\"], " + "\"security_groups\": [\"\"], " + "\"allowed_address_pairs\": [\"\"], "
             + "\"device_id\": \"257614cc-e178-4c92-9c61-3b28d40eca44\", " + "\"device_owner\": \"\", "
@@ -89,8 +83,8 @@ public class NeutronPortSecurityJAXBTest {
             Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                     neutronObject.getID());
 
-            Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed",
-                    "9bacb3c5d39d41a79512987f338cf177", neutronObject.getTenantID());
+            Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                    neutronObject.getTenantID());
 
             Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed",
                     "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID());
index 869f7e127d384895d418290860cb3d81f8c7e6a0..ec195ca98d2421770db5d3bf4d40ab53d13127c4 100644 (file)
@@ -14,8 +14,7 @@ import org.junit.Test;
 public class NeutronPort_AllowedAddressPairsJAXBTest {
 
     private static final String NeutronPort_AllowedAddressPairs_sourceJson = "{ "
-            + "\"ip_address\": \"192.168.199.1\", "
-            + "\"mac_address\": \"fa:16:3e:c9:cb:f0\" }";
+            + "\"ip_address\": \"192.168.199.1\", " + "\"mac_address\": \"fa:16:3e:c9:cb:f0\" }";
 
     @Test
     public void test_NeutronPort_AllowedAddressPairs_JAXB() {
index 8568eac5a8a39b7351ce3fd40772e6dad43d8ffe..02a08857600a7b6096b64618e01e05d9686f62ff 100644 (file)
@@ -14,35 +14,32 @@ import org.junit.Test;
 public class NeutronPort_ExtraDHCPOptionJAXBTest {
 
     private static final String NeutronPort_ExtraDHCPOption_sourceJson = "{" + "\"opt_value\": \"123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\" "
-            + "}";
-    private static final String NeutronPort_ExtraDHCPOption_IPv4_sourceJson = "{" + "\"opt_value\": \"123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\", "
-            + "\"ip_version\": 4"
-            + "}";
-    private static final String NeutronPort_ExtraDHCPOption_IPv6_sourceJson = "{" + "\"opt_value\": \"::ffff:123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\", "
-            + "\"ip_version\": 6"
+            + "\"opt_name\": \"server-ip-address\" " + "}";
+    private static final String NeutronPort_ExtraDHCPOption_IPv4_sourceJson = "{"
+            + "\"opt_value\": \"123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", " + "\"ip_version\": 4"
             + "}";
+    private static final String NeutronPort_ExtraDHCPOption_IPv6_sourceJson = "{"
+            + "\"opt_value\": \"::ffff:123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", "
+            + "\"ip_version\": 6" + "}";
 
     @Test
     public void test_NeutronPort_ExtraDHCPOption_JAXB() {
         NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption();
         NeutronPort_ExtraDHCPOption testObject;
         try {
-            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(
-                    portObject, NeutronPort_ExtraDHCPOption_sourceJson);
+            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
+                    NeutronPort_ExtraDHCPOption_sourceJson);
         } catch (Exception e) {
             Assert.assertFalse("Tests Failed", true);
             return;
         }
 
         Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 1: Testing opt_value failed", "123.123.123.456",
-                            testObject.getValue());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 20: Testing opt_name failed",
-                            4, testObject.getIpVersion().intValue());
+                testObject.getValue());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 10: Testing opt_name failed", "server-ip-address",
+                testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 20: Testing opt_name failed", 4,
+                testObject.getIpVersion().intValue());
     }
 
     @Test
@@ -50,19 +47,19 @@ public class NeutronPort_ExtraDHCPOptionJAXBTest {
         NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption();
         NeutronPort_ExtraDHCPOption testObject;
         try {
-            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(
-                    portObject, NeutronPort_ExtraDHCPOption_IPv4_sourceJson);
+            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
+                    NeutronPort_ExtraDHCPOption_IPv4_sourceJson);
         } catch (Exception e) {
             Assert.assertFalse("Tests Failed", true);
             return;
         }
 
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed",
-                            "123.123.123.456", testObject.getValue());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed", "123.123.123.456",
+                testObject.getValue());
         Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed",
-                            4, testObject.getIpVersion().intValue());
+                "server-ip-address", testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed", 4,
+                testObject.getIpVersion().intValue());
     }
 
     @Test
@@ -70,18 +67,18 @@ public class NeutronPort_ExtraDHCPOptionJAXBTest {
         NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption();
         NeutronPort_ExtraDHCPOption testObject;
         try {
-            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(
-                    portObject, NeutronPort_ExtraDHCPOption_IPv6_sourceJson);
+            testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
+                    NeutronPort_ExtraDHCPOption_IPv6_sourceJson);
         } catch (Exception e) {
             Assert.assertFalse("Tests Failed", true);
             return;
         }
 
         Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 1: Testing opt_value failed",
-                            "::ffff:123.123.123.456", testObject.getValue());
+                "::ffff:123.123.123.456", testObject.getValue());
         Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed",
-                            6, testObject.getIpVersion().intValue());
+                "server-ip-address", testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed", 6,
+                testObject.getIpVersion().intValue());
     }
 }
index 318a20e61da5a952f380664ee7bfea6053a1a977..015abb69f27d56ac16d7cfdac519ddacdc7d9bd0 100644 (file)
@@ -16,68 +16,60 @@ import org.junit.Test;
 
 public class NeutronQosJAXBTest {
 
-    private static final String NeutronQosPolicy_sourceJson =
-        "{" + "\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\"," +
-        "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\"," + "\"name\": \"jaxb-test\", " +
-        " \"shared\": false," + "\"rule_type\": \"rule\", " +
-        "\"bandwidth_limit_rules\": [ {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3547\", " +
-        "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a14\"," + "\"max_kbps\": 25, " +
-        "\"max_burst_kbps\": 100 } ]," +
-        "\"dscp_marking_rules\": [ {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3547\"," +
-        " \"tenant_id\": \"aa902936679e4ea29bfe1158e3450a14\", " +
-        "\"dscp_mark\": 8 } ] " +
-        "}";
+    private static final String NeutronQosPolicy_sourceJson = "{" + "\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3546\","
+            + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\"," + "\"name\": \"jaxb-test\", "
+            + " \"shared\": false," + "\"rule_type\": \"rule\", "
+            + "\"bandwidth_limit_rules\": [ {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3547\", "
+            + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a14\"," + "\"max_kbps\": 25, "
+            + "\"max_burst_kbps\": 100 } ],"
+            + "\"dscp_marking_rules\": [ {\"id\": \"d6220bbb-35f3-48ab-8eae-69c60aef3547\","
+            + " \"tenant_id\": \"aa902936679e4ea29bfe1158e3450a14\", " + "\"dscp_mark\": 8 } ] " + "}";
 
     @Test
     public void test_NeutronQosPolicy_JAXB() throws JAXBException {
         NeutronQosPolicy testObject = new NeutronQosPolicy();
-        NeutronQosPolicy neutronObject = (NeutronQosPolicy) JaxbTestHelper
-            .jaxbUnmarshall(testObject, NeutronQosPolicy_sourceJson);
-        Assert.assertEquals("NeutronQosPolicy JAXB Test 1: Testing id failed",
-            "d6220bbb-35f3-48ab-8eae-69c60aef3546", neutronObject.getID());
+        NeutronQosPolicy neutronObject = (NeutronQosPolicy) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronQosPolicy_sourceJson);
+        Assert.assertEquals("NeutronQosPolicy JAXB Test 1: Testing id failed", "d6220bbb-35f3-48ab-8eae-69c60aef3546",
+                neutronObject.getID());
 
         Assert.assertEquals("NeutronQosPolicy JAXB Test 2: Testing tenant_id failed",
-            "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
+                "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
 
         Assert.assertEquals("NeutronQosPolicy JAXB Test 3 : Testing Name failed", "jaxb-test",
-            neutronObject.getQosPolicyName());
+                neutronObject.getQosPolicyName());
 
-        Assert.assertFalse("NeutronQosPolicy JaxB Test 4 : Testing Shared failed",
-            neutronObject.getPolicyIsShared());
+        Assert.assertFalse("NeutronQosPolicy JaxB Test 4 : Testing Shared failed", neutronObject.getPolicyIsShared());
 
         List<NeutronQosBandwidthRule> bwPolicyRules = neutronObject.getBwLimitRules();
 
-        Assert.assertEquals(
-            "NeutronQosPolicy JAXB Test 5.0: Testing Bandwidth Policy length failed", 1,
-            bwPolicyRules.size());
+        Assert.assertEquals("NeutronQosPolicy JAXB Test 5.0: Testing Bandwidth Policy length failed", 1,
+                bwPolicyRules.size());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.1 : Testing ID failed",
-            "d6220bbb-35f3-48ab-8eae-69c60aef3547", bwPolicyRules.get(0).uuid);
+                "d6220bbb-35f3-48ab-8eae-69c60aef3547", bwPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.2 : Testing Tenant ID failed",
-            "aa902936679e4ea29bfe1158e3450a14", bwPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", bwPolicyRules.get(0).tenantID);
 
-        Assert.assertEquals(
-            "NeutronQosPolicy JaxB Test 5.3 : Testing Max ingress/Egress value failed",
-            new BigInteger("25"), bwPolicyRules.get(0).maxKbps);
+        Assert.assertEquals("NeutronQosPolicy JaxB Test 5.3 : Testing Max ingress/Egress value failed",
+                new BigInteger("25"), bwPolicyRules.get(0).maxKbps);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.4 : Testing Maximum Burst value failed",
-            new BigInteger("100"), bwPolicyRules.get(0).maxBurstKbps);
+                new BigInteger("100"), bwPolicyRules.get(0).maxBurstKbps);
 
         List<NeutronQosDscpMarkingRule> dscpPolicyRules = neutronObject.getDscpRules();
 
-        Assert.assertEquals(
-            "NeutronQosPolicy JAXB Test 6.0: Testing Bandwidth Policy length failed", 1,
-            dscpPolicyRules.size());
+        Assert.assertEquals("NeutronQosPolicy JAXB Test 6.0: Testing Bandwidth Policy length failed", 1,
+                dscpPolicyRules.size());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.1 : Testing ID failed",
-            "d6220bbb-35f3-48ab-8eae-69c60aef3547", dscpPolicyRules.get(0).uuid);
+                "d6220bbb-35f3-48ab-8eae-69c60aef3547", dscpPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.2 : Testing Tenant ID failed",
-            "aa902936679e4ea29bfe1158e3450a14", dscpPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", dscpPolicyRules.get(0).tenantID);
 
-        Assert.assertEquals(
-            "NeutronQosPolicy JaxB Test 6.3 : Testing Max ingress/Egress value failed",
-            new Short("8"), dscpPolicyRules.get(0).dscpMark);
+        Assert.assertEquals("NeutronQosPolicy JaxB Test 6.3 : Testing Max ingress/Egress value failed", new Short("8"),
+                dscpPolicyRules.get(0).dscpMark);
     }
 }
index e4e0aad95ec9c4bcbdc1bc89158e70379207dfd8..3f6b31573bd368611d2e2ba8016536218f7e0948 100644 (file)
@@ -14,16 +14,12 @@ import org.junit.Test;
 
 public class NeutronRouterJAXBTest {
 
-    private static final String NeutronRouter_sourceJson = "{" +
-        "\"id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f5\", " +
-        "\"name\": \"jaxb-test\", " +
-        "\"admin_state_up\": false , " +
-        "\"status\": \"ACTIVE\", " +
-        "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", " +
-        "\"external_gateway_info\": {\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f6\" }, " +
-        "\"distributed\": false , " +
-        "\"gw_port_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17127\", " +
-        "\"routes\": [ { \"destination\":\"10.0.0.0/24\",\"nexthop\":\"1.1.1.1\" } ] }";
+    private static final String NeutronRouter_sourceJson = "{" + "\"id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f5\", "
+            + "\"name\": \"jaxb-test\", " + "\"admin_state_up\": false , " + "\"status\": \"ACTIVE\", "
+            + "\"tenant_id\": \"aa902936679e4ea29bfe1158e3450a13\", "
+            + "\"external_gateway_info\": {\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f6\" }, "
+            + "\"distributed\": false , " + "\"gw_port_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17127\", "
+            + "\"routes\": [ { \"destination\":\"10.0.0.0/24\",\"nexthop\":\"1.1.1.1\" } ] }";
 
     @Test
     public void test_NeutronRouter_JAXB() {
@@ -59,8 +55,8 @@ public class NeutronRouterJAXBTest {
 
             Assert.assertEquals("NeutronRouter JAXB Test 9.1: Testing routes failed", 1, routes.size());
 
-            Assert.assertEquals("NeutronRouter JAXB Test 9.2: Testing routes failed",
-                    "10.0.0.0/24", routes.get(0).getDestination());
+            Assert.assertEquals("NeutronRouter JAXB Test 9.2: Testing routes failed", "10.0.0.0/24",
+                    routes.get(0).getDestination());
 
         } catch (Exception e) {
             Assert.fail("Tests failed");
index 29955eb550267baabb2220acecf28f40e691d07e..3198d4a95b86ebfb2be1eabfd07992a850478e84 100644 (file)
@@ -12,10 +12,10 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronRouter_InterfaceJAXBTest {
-    private static final String NeutronRouter_Interface_sourceJson = "{" +
-        "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\", " +
-        "\"port_id\": \"65c0ee9f-d634-4522-8954-51021b570b0d\", " +
-        "\"id\": \"7370da7f-234e-3f7a-ed12-e384131d886d\" }";
+    private static final String NeutronRouter_Interface_sourceJson = "{"
+            + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\", "
+            + "\"port_id\": \"65c0ee9f-d634-4522-8954-51021b570b0d\", "
+            + "\"id\": \"7370da7f-234e-3f7a-ed12-e384131d886d\" }";
 
     @Test
     public void test_NeutronRouter_Interface_JAXB() {
index b100351a52fb9afd2df639e512012fe3b1d4fd73..b0db42394a0cd9beacb2a366f39eb6170439b34e 100644 (file)
@@ -14,18 +14,18 @@ import org.junit.Test;
 
 public class NeutronRouter_NetworkReferenceJAXBTest {
 
-    private static final String NeutronRouter_NetworkReference_sourceJson = "{" +
-        "\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f6\" ," +
-        "\"enable_snat\": false , " +
-        "\"external_fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , \"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ]" +
-        "}";
+    private static final String NeutronRouter_NetworkReference_sourceJson = "{"
+            + "\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f6\" ," + "\"enable_snat\": false , "
+            + "\"external_fixed_ips\": [ { \"ip_address\":\"192.168.111.3\" , "
+            + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" } ]"
+            + "}";
 
     @Test
     public void test_NeutronRouter_NetworkReference_JAXB() {
         NeutronRouter_NetworkReference dummyObject = new NeutronRouter_NetworkReference();
         try {
-            NeutronRouter_NetworkReference testObject = (NeutronRouter_NetworkReference) JaxbTestHelper.jaxbUnmarshall(
-                    dummyObject, NeutronRouter_NetworkReference_sourceJson);
+            NeutronRouter_NetworkReference testObject = (NeutronRouter_NetworkReference) JaxbTestHelper
+                    .jaxbUnmarshall(dummyObject, NeutronRouter_NetworkReference_sourceJson);
 
             List<Neutron_IPs> externalFixedIPs = testObject.getExternalFixedIPs();
 
index 0a0734754be3beddbbee2ac674af59825db78981..de94a84608c55aa47ef8984da8866e4ed7c753a2 100644 (file)
@@ -17,44 +17,33 @@ import org.junit.Test;
  */
 public class NeutronSFCFlowClassifierJAXBTest {
 
-    private static final String NeutronSFCFlowClassifier_sourceJson = "{ "
-            + "\"name\": \"flowclassifier1\", "
-            + "\"ethertype\": \"IPv4\", "
-            + "\"protocol\": \"UDP\", "
-            + "\"source_port_range_min\": 100, "
-            + "\"source_port_range_max\": 200, "
-            + "\"destination_port_range_min\": 100, "
-            + "\"destination_port_range_max\": 200, "
-            + "\"source_ip_prefix\": \"10.0.0.0/24\", "
+    private static final String NeutronSFCFlowClassifier_sourceJson = "{ " + "\"name\": \"flowclassifier1\", "
+            + "\"ethertype\": \"IPv4\", " + "\"protocol\": \"UDP\", " + "\"source_port_range_min\": 100, "
+            + "\"source_port_range_max\": 200, " + "\"destination_port_range_min\": 100, "
+            + "\"destination_port_range_max\": 200, " + "\"source_ip_prefix\": \"10.0.0.0/24\", "
             + "\"destination_ip_prefix\": \"11.0.0.0/24\", "
             + "\"logical_source_port\": \"5e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"logical_destination_port\": \"6e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"l7_parameters\": [ "
-            + "{ "
-            + "\"Key\": \"value\" "
-            + "} "
-            + "], "
-            + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
+            + "\"logical_destination_port\": \"6e8e5957-649f-477b-9e5b-f1f75b21c03c\", " + "\"l7_parameters\": [ "
+            + "{ " + "\"Key\": \"value\" " + "} " + "], " + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronSFCFlowClassifier_JAXB() throws JAXBException {
         NeutronSFCFlowClassifier testObject = new NeutronSFCFlowClassifier();
-        NeutronSFCFlowClassifier neutronObject
-                = (NeutronSFCFlowClassifier) JaxbTestHelper.jaxbUnmarshall(testObject
-                , NeutronSFCFlowClassifier_sourceJson);
+        NeutronSFCFlowClassifier neutronObject = (NeutronSFCFlowClassifier) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronSFCFlowClassifier_sourceJson);
 
-        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 1: Testing id failed"
-                , "4e8e5957-649f-477b-9e5b-f1f75b21c03c",neutronObject.getID());
+        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 1: Testing id failed",
+                "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 2: Testing tenant_id failed",
                 "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
 
-        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 3: Testing ethertype failed",
-                "IPv4", neutronObject.getEthertype());
+        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 3: Testing ethertype failed", "IPv4",
+                neutronObject.getEthertype());
 
-        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 4: Testing protocol failed",
-                "UDP", neutronObject.getProtocol());
+        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 4: Testing protocol failed", "UDP",
+                neutronObject.getProtocol());
 
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 5: Testing source_port_range_min failed",
                 new Integer(100), neutronObject.getSourcePortRangeMin());
@@ -68,8 +57,8 @@ public class NeutronSFCFlowClassifierJAXBTest {
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 8: Testing destination_port_range_max failed",
                 new Integer(200), neutronObject.getDestinationPortRangeMax());
 
-        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 9: Testing source_ip_prefix failed",
-                "10.0.0.0/24", neutronObject.getSourceIpPrefix());
+        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 9: Testing source_ip_prefix failed", "10.0.0.0/24",
+                neutronObject.getSourceIpPrefix());
 
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 10: Testing destination_ip_prefix failed",
                 "11.0.0.0/24", neutronObject.getDestinationIpPrefix());
index 9fa2e67bb17c71317eec1ce2f97430fce6ec7d09..317c8ad7d2f7e42aa363f9234212db35895eecc4 100644 (file)
@@ -17,21 +17,11 @@ import org.junit.Test;
  */
 public class NeutronSFCPortChainJAXBTest {
 
-    private static final String NeutronSFCPortChain_sourceJson = "{ "
-            + "\"name\": \"portchain1\", "
-            + "\"port_pair_groups\": [ "
-            + "\"4512d643-24fc-4fae-af4b-321c5e2eb3d1\", "
-            + "\"4a634d49-76dc-4fae-af4b-321c5e23d651\" "
-            + "], "
-            + "\"flow_classifiers\": [ "
-            + "\"4a334cd4-fe9c-4fae-af4b-321c5e2eb051\", "
-            + "\"105a4b0a-73d6-11e5-b392-2c27d72acb4c\" "
-            + "], "
-            + "\"chain_parameters\": [ "
-            + "{ "
-            + "\"correlation\": \"value\" "
-            + "} "
-            + "], "
+    private static final String NeutronSFCPortChain_sourceJson = "{ " + "\"name\": \"portchain1\", "
+            + "\"port_pair_groups\": [ " + "\"4512d643-24fc-4fae-af4b-321c5e2eb3d1\", "
+            + "\"4a634d49-76dc-4fae-af4b-321c5e23d651\" " + "], " + "\"flow_classifiers\": [ "
+            + "\"4a334cd4-fe9c-4fae-af4b-321c5e2eb051\", " + "\"105a4b0a-73d6-11e5-b392-2c27d72acb4c\" " + "], "
+            + "\"chain_parameters\": [ " + "{ " + "\"correlation\": \"value\" " + "} " + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
@@ -39,25 +29,24 @@ public class NeutronSFCPortChainJAXBTest {
     public void test_NeutronSFCPortChain_JAXB() throws JAXBException {
 
         NeutronSFCPortChain testObject = new NeutronSFCPortChain();
-        NeutronSFCPortChain neutronObject
-                = (NeutronSFCPortChain) JaxbTestHelper.jaxbUnmarshall(testObject
-                , NeutronSFCPortChain_sourceJson);
+        NeutronSFCPortChain neutronObject = (NeutronSFCPortChain) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronSFCPortChain_sourceJson);
 
-        Assert.assertEquals("NeutronSFCPortChain JAXB Test 1: Testing id failed"
-                , "4e8e5957-649f-477b-9e5b-f1f75b21c03c",neutronObject.getID());
+        Assert.assertEquals("NeutronSFCPortChain JAXB Test 1: Testing id failed",
+                "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
         Assert.assertEquals("NeutronSFCPortChain JAXB Test 2: Testing tenant_id failed",
                 "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
 
-        Assert.assertEquals("NeutronSFCPortChain JAXB Test 3: Testing flow_classifiers failed",
-                2, neutronObject.getFlowClassifiersUUID().size());
+        Assert.assertEquals("NeutronSFCPortChain JAXB Test 3: Testing flow_classifiers failed", 2,
+                neutronObject.getFlowClassifiersUUID().size());
 
-        Assert.assertEquals("NeutronSFCPortChain JAXB Test 4: Testing port_pair_groups failed",
-                2, neutronObject.getPortPairGroupsUUID().size());
+        Assert.assertEquals("NeutronSFCPortChain JAXB Test 4: Testing port_pair_groups failed", 2,
+                neutronObject.getPortPairGroupsUUID().size());
 
         Map<String, String> param = neutronObject.getChainParameters();
-        Assert.assertEquals("NeutronSFCPortChain JAXB Test 5: Testing chain_parameters list length " +
-                "failed", 1, param.size());
+        Assert.assertEquals("NeutronSFCPortChain JAXB Test 5: Testing chain_parameters list length " + "failed", 1,
+                param.size());
 
     }
 }
index 322f4780e63e21a88c109c9bd5a16c7727bfd8e7..f324df87a26648a3dace8f120e8de5cf4329a04f 100644 (file)
@@ -15,23 +15,19 @@ import org.junit.Test;
  * Created by Anil Vishnoi (avishnoi@Brocade.com)
  */
 public class NeutronSFCPortPairGroupJAXBTest {
-    private static final String NeutronSFCPortPairGroup_sourceJson = "{ "
-            + "\"name\": \"portpair1\", "
-            + "\"port_pairs\": [ "
-            + "\"d11e9190-73d4-11e5-b392-2c27d72acb4c\""
-            + "], "
+    private static final String NeutronSFCPortPairGroup_sourceJson = "{ " + "\"name\": \"portpair1\", "
+            + "\"port_pairs\": [ " + "\"d11e9190-73d4-11e5-b392-2c27d72acb4c\"" + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronSFCPortPairGroup_JAXB() throws JAXBException {
         NeutronSFCPortPairGroup testObject = new NeutronSFCPortPairGroup();
-        NeutronSFCPortPairGroup neutronObject
-                = (NeutronSFCPortPairGroup) JaxbTestHelper.jaxbUnmarshall(testObject
-                , NeutronSFCPortPairGroup_sourceJson);
+        NeutronSFCPortPairGroup neutronObject = (NeutronSFCPortPairGroup) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronSFCPortPairGroup_sourceJson);
 
-        Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 1: Testing id failed"
-                , "4e8e5957-649f-477b-9e5b-f1f75b21c03c",neutronObject.getID());
+        Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 1: Testing id failed",
+                "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
         Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 2: Testing tenant_id failed",
                 "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
index 1b8500b80fd6f61ecb1cbaa88d29c69f3029d0d4..fe8aad0704181dd541c6e49af3b713fa510c6330 100644 (file)
@@ -17,27 +17,20 @@ import org.junit.Test;
  */
 public class NeutronSFCPortPairJAXBTest {
 
-    private static final String NeutronSFCPortPair_sourceJson = "{ "
-            + "\"name\": \"portpair1\", "
+    private static final String NeutronSFCPortPair_sourceJson = "{ " + "\"name\": \"portpair1\", "
             + "\"ingress\": \"5e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"egress\": \"6e8e5957-649f-477b-9e5b-f1f75b21c03c\", "
-            + "\"service_function_parameters\": [ "
-            + "{ "
-            + "\"correlation\": \"value\" "
-            + "} "
-            + "], "
-            + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
+            + "\"egress\": \"6e8e5957-649f-477b-9e5b-f1f75b21c03c\", " + "\"service_function_parameters\": [ " + "{ "
+            + "\"correlation\": \"value\" " + "} " + "], " + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
             + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_NeutronSFCPortPair_JAXB() throws JAXBException {
         NeutronSFCPortPair testObject = new NeutronSFCPortPair();
-        NeutronSFCPortPair neutronObject
-                = (NeutronSFCPortPair) JaxbTestHelper.jaxbUnmarshall(testObject
-                , NeutronSFCPortPair_sourceJson);
+        NeutronSFCPortPair neutronObject = (NeutronSFCPortPair) JaxbTestHelper.jaxbUnmarshall(testObject,
+                NeutronSFCPortPair_sourceJson);
 
-        Assert.assertEquals("NeutronSFCPortPair JAXB Test 1: Testing id failed"
-                , "4e8e5957-649f-477b-9e5b-f1f75b21c03c",neutronObject.getID());
+        Assert.assertEquals("NeutronSFCPortPair JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
+                neutronObject.getID());
 
         Assert.assertEquals("NeutronSFCPortPair JAXB Test 2: Testing tenant_id failed",
                 "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
@@ -49,7 +42,8 @@ public class NeutronSFCPortPairJAXBTest {
                 "6e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getEgressPortUUID());
 
         Map<String, String> param = neutronObject.getServiceFunctionParameters();
-        Assert.assertEquals("NeutronSFCPortPair JAXB Test 5: Testing service_function_parameters list length " +
-                "failed", 1, param.size());
+        Assert.assertEquals(
+                "NeutronSFCPortPair JAXB Test 5: Testing service_function_parameters list length " + "failed", 1,
+                param.size());
     }
 }
index 2ce8fb6f495f58e3696afdc24f077f98dcb1b248..65822434e2ee9cf375c60bdf4869b0e760706599 100644 (file)
@@ -12,32 +12,28 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronSecurityGroupJAXBTest {
-    private static final String NeutronSecurityGroup_sourceJson = "{" +
-        "\"id\": \"2076db17-a522-4506-91de-c6dd8e837028\", " +
-        "\"name\": \"new-webservers\", " +
-        "\"description\": \"security group for webservers\", " +
-        "\"tenant_id\": \"b4f50856753b4dc6afee5fa6b9b6c550\", " +
-        "\"security_group_rules\": [ { \"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\" , " +
-                                       "\"direction\": \"ingress\" , " +
-                                       "\"protocol\": \"tcp\" , " +
-                                       "\"port_range_min\": 80 , " +
-                                       "\"port_range_max\": 80 , " +
-                                       "\"ethertype\": \"IPv4\" ," +
-                                       "\"remote_ip_prefix\": \"0.0.0.0/0\" , " +
-                                       "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\" , " +
-                                       "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\" , " +
-                                       "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" } ]" +
-        "}";
+    private static final String NeutronSecurityGroup_sourceJson = "{"
+            + "\"id\": \"2076db17-a522-4506-91de-c6dd8e837028\", " + "\"name\": \"new-webservers\", "
+            + "\"description\": \"security group for webservers\", "
+            + "\"tenant_id\": \"b4f50856753b4dc6afee5fa6b9b6c550\", "
+            + "\"security_group_rules\": [ { \"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\" , "
+            + "\"direction\": \"ingress\" , " + "\"protocol\": \"tcp\" , " + "\"port_range_min\": 80 , "
+            + "\"port_range_max\": 80 , " + "\"ethertype\": \"IPv4\" ," + "\"remote_ip_prefix\": \"0.0.0.0/0\" , "
+            + "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\" , "
+            + "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\" , "
+            + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" } ]" + "}";
+
     @Test
     public void test_NeutronSecurityGroup_JAXB() {
         NeutronSecurityGroup dummyObject = new NeutronSecurityGroup();
         try {
-            NeutronSecurityGroup testObject = (NeutronSecurityGroup) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronSecurityGroup_sourceJson);
+            NeutronSecurityGroup testObject = (NeutronSecurityGroup) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronSecurityGroup_sourceJson);
             Assert.assertEquals("NeutronSecurityGroup JAXB Test 1: Testing id failed",
-                  "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID());
+                    "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID());
 
-            Assert.assertEquals("NeutronSecurityGroup JAXB Test 2: Testing direction failed",
-                  "new-webservers", testObject.getSecurityGroupName());
+            Assert.assertEquals("NeutronSecurityGroup JAXB Test 2: Testing direction failed", "new-webservers",
+                    testObject.getSecurityGroupName());
 
             Assert.assertEquals("NeutronSecurityGroup JAXB Test 4: Testing port range min failed",
                     "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID());
index 659c597d61ac05bff24aa79b8898ea4e6a725751..30c29cb7eb155204f9789176fd0bca0d78c23ffd 100644 (file)
@@ -14,70 +14,59 @@ import org.junit.Test;
 
 public class NeutronSecurityRuleJAXBTest {
 
-    private static final String NeutronSecurityRule_sourceJson="{" +
-        "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " +
-        "\"direction\": \"ingress\", " +
-        "\"protocol\": \"tcp\", " +
-        "\"port_range_min\": 80, " +
-        "\"port_range_max\": 80, " +
-        "\"ethertype\": \"IPv4\", " +
-        "\"remote_ip_prefix\": \"0.0.0.0/0\", " +
-        "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", " +
-        "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", " +
-        "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
-
-    private static final String NeutronSecurityRuleProtocolNumber_sourceJson="{" +
-        "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " +
-        "\"direction\": \"ingress\", " +
-        "\"protocol\": 6, " +
-        "\"port_range_min\": 80, " +
-        "\"port_range_max\": 80, " +
-        "\"ethertype\": \"IPv4\", " +
-        "\"remote_ip_prefix\": \"0.0.0.0/0\", " +
-        "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", " +
-        "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", " +
-        "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
-
-    private static final String NeutronSecurityRuleProtocolNumberString_sourceJson="{" +
-        "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " +
-        "\"direction\": \"ingress\", " +
-        "\"protocol\": \"6\", " +
-        "\"port_range_min\": 80, " +
-        "\"port_range_max\": 80, " +
-        "\"ethertype\": \"IPv4\", " +
-        "\"remote_ip_prefix\": \"0.0.0.0/0\", " +
-        "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", " +
-        "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", " +
-        "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
+    private static final String NeutronSecurityRule_sourceJson = "{"
+            + "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " + "\"direction\": \"ingress\", "
+            + "\"protocol\": \"tcp\", " + "\"port_range_min\": 80, " + "\"port_range_max\": 80, "
+            + "\"ethertype\": \"IPv4\", " + "\"remote_ip_prefix\": \"0.0.0.0/0\", "
+            + "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", "
+            + "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", "
+            + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
+
+    private static final String NeutronSecurityRuleProtocolNumber_sourceJson = "{"
+            + "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " + "\"direction\": \"ingress\", "
+            + "\"protocol\": 6, " + "\"port_range_min\": 80, " + "\"port_range_max\": 80, "
+            + "\"ethertype\": \"IPv4\", " + "\"remote_ip_prefix\": \"0.0.0.0/0\", "
+            + "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", "
+            + "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", "
+            + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
+
+    private static final String NeutronSecurityRuleProtocolNumberString_sourceJson = "{"
+            + "\"id\": \"2bc0accf-312e-429a-956e-e4407625eb62\", " + "\"direction\": \"ingress\", "
+            + "\"protocol\": \"6\", " + "\"port_range_min\": 80, " + "\"port_range_max\": 80, "
+            + "\"ethertype\": \"IPv4\", " + "\"remote_ip_prefix\": \"0.0.0.0/0\", "
+            + "\"remote_group_id\": \"85cc3048-abc3-43cc-89b3-377341426ac5\", "
+            + "\"security_group_id\": \"a7734e61-b545-452d-a3cd-0189cbd9747a\", "
+            + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }";
 
     @Test
     public void test_NeutronSecurityRule_JAXB() {
         NeutronSecurityRule dummyObject = new NeutronSecurityRule();
         try {
-            NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronSecurityRule_sourceJson);
+            NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronSecurityRule_sourceJson);
             Assert.assertEquals("NeutronSecurityRule JAXB Test 1: Testing id failed",
-                  "2bc0accf-312e-429a-956e-e4407625eb62", testObject.getID());
+                    "2bc0accf-312e-429a-956e-e4407625eb62", testObject.getID());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 2: Testing direction failed",
-                  "ingress", testObject.getSecurityRuleDirection());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 2: Testing direction failed", "ingress",
+                    testObject.getSecurityRuleDirection());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 3: Testing protocol failed",
-                  "tcp", testObject.getSecurityRuleProtocol());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 3: Testing protocol failed", "tcp",
+                    testObject.getSecurityRuleProtocol());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 4: Testing port range min failed",
-                    new Integer(80), testObject.getSecurityRulePortMin());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 4: Testing port range min failed", new Integer(80),
+                    testObject.getSecurityRulePortMin());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 5: Testing port range max failed",
-                    new Integer(80), testObject.getSecurityRulePortMax());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 5: Testing port range max failed", new Integer(80),
+                    testObject.getSecurityRulePortMax());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 6: Testing ethertype failed",
-                  "IPv4", testObject.getSecurityRuleEthertype());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 6: Testing ethertype failed", "IPv4",
+                    testObject.getSecurityRuleEthertype());
 
-            Assert.assertEquals("NeutronSecurityRule JAXB Test 7: Testing remote ip prefix failed",
-                   "0.0.0.0/0", testObject.getSecurityRuleRemoteIpPrefix());
+            Assert.assertEquals("NeutronSecurityRule JAXB Test 7: Testing remote ip prefix failed", "0.0.0.0/0",
+                    testObject.getSecurityRuleRemoteIpPrefix());
 
             Assert.assertEquals("NeutronSecurityRule JAXB Test 8: Testing remote group id failed",
-                  "85cc3048-abc3-43cc-89b3-377341426ac5", testObject.getSecurityRemoteGroupID());
+                    "85cc3048-abc3-43cc-89b3-377341426ac5", testObject.getSecurityRemoteGroupID());
 
             Assert.assertEquals("NeutronSecurityRule JAXB Test 9: Testing security group id failed",
                     "a7734e61-b545-452d-a3cd-0189cbd9747a", testObject.getSecurityRuleGroupID());
@@ -92,20 +81,18 @@ public class NeutronSecurityRuleJAXBTest {
     @Test
     public void test_NeutronSecurityRuleProtocolNumber_JAXB() throws JAXBException {
         NeutronSecurityRule dummyObject = new NeutronSecurityRule();
-        NeutronSecurityRule testObject =
-            (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
-                                                                NeutronSecurityRuleProtocolNumber_sourceJson);
-        Assert.assertEquals("NeutronSecurityRuleProtocolNumber JAXB: Testing protocol failed",
-                            "6", testObject.getSecurityRuleProtocol());
+        NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                NeutronSecurityRuleProtocolNumber_sourceJson);
+        Assert.assertEquals("NeutronSecurityRuleProtocolNumber JAXB: Testing protocol failed", "6",
+                testObject.getSecurityRuleProtocol());
     }
 
     @Test
     public void test_NeutronSecurityRuleProtocolNumberString_JAXB() throws JAXBException {
         NeutronSecurityRule dummyObject = new NeutronSecurityRule();
-        NeutronSecurityRule testObject =
-            (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
-                                                                NeutronSecurityRuleProtocolNumberString_sourceJson);
-        Assert.assertEquals("NeutronSecurityRuleProtocolNumberString JAXB: Testing protocol failed",
-                            "6", testObject.getSecurityRuleProtocol());
+        NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                NeutronSecurityRuleProtocolNumberString_sourceJson);
+        Assert.assertEquals("NeutronSecurityRuleProtocolNumberString JAXB: Testing protocol failed", "6",
+                testObject.getSecurityRuleProtocol());
     }
 }
index 331f875c570edbea367f69ae8de0dd5f6e469da7..743f2899e9d874e9508206534e2a0870ded597ad 100644 (file)
@@ -16,14 +16,13 @@ import org.junit.Test;
 public class NeutronSubnetIPAllocationPoolTest {
     @Test
     public void convertTest() {
-        Assert.assertEquals("Convert Test 1: null Argument failed",
-              0, NeutronSubnetIPAllocationPool.convert(null));
+        Assert.assertEquals("Convert Test 1: null Argument failed", 0, NeutronSubnetIPAllocationPool.convert(null));
 
-        Assert.assertEquals("Convert Test 2: convert of 32.20.10.0 failed",
-              538184192, NeutronSubnetIPAllocationPool.convert("32.20.10.0"));
+        Assert.assertEquals("Convert Test 2: convert of 32.20.10.0 failed", 538184192,
+                NeutronSubnetIPAllocationPool.convert("32.20.10.0"));
 
-        Assert.assertEquals("Convert Test 3: convert of 192.168.2.140 failed",
-              3232236172L, NeutronSubnetIPAllocationPool.convert("192.168.2.140"));
+        Assert.assertEquals("Convert Test 3: convert of 192.168.2.140 failed", 3232236172L,
+                NeutronSubnetIPAllocationPool.convert("192.168.2.140"));
     }
 
     @Test
@@ -31,47 +30,42 @@ public class NeutronSubnetIPAllocationPoolTest {
         boolean result = BigInteger.ZERO.equals(NeutronSubnetIPAllocationPool.convertV6(null));
         Assert.assertTrue("Convert V6 Test 1: null Argument failed", result);
 
-        result = new BigInteger("42550872755692912415807417417958686721").
-            equals(NeutronSubnetIPAllocationPool.convertV6("2003:0:0:0:0:0:0:1"));
+        result = new BigInteger("42550872755692912415807417417958686721")
+                .equals(NeutronSubnetIPAllocationPool.convertV6("2003:0:0:0:0:0:0:1"));
         Assert.assertTrue("Convert V6 Test 2: 2003:0:0:0:0:0:0:1 Argument failed", result);
     }
 
-
     @Test
     public void longToIPTest() {
-        Assert.assertEquals("longToIP Test 1: convert of 538184192L failed",
-              "32.20.10.0", NeutronSubnetIPAllocationPool.longToIP(538184192L));
+        Assert.assertEquals("longToIP Test 1: convert of 538184192L failed", "32.20.10.0",
+                NeutronSubnetIPAllocationPool.longToIP(538184192L));
 
-        Assert.assertEquals("longToIP Test 2: convert of 3232236172L failed",
-              "192.168.2.140", NeutronSubnetIPAllocationPool.longToIP(3232236172L));
+        Assert.assertEquals("longToIP Test 2: convert of 3232236172L failed", "192.168.2.140",
+                NeutronSubnetIPAllocationPool.longToIP(3232236172L));
     }
 
     @Test
     public void bigIntegerToIPTest() {
         BigInteger start = new BigInteger("42550872755692912415807417417958686721");
         Assert.assertEquals("longToIP Test 1: convert of 42550872755692912415807417417958686721 failed",
-             "2003:0:0:0:0:0:0:1", NeutronSubnetIPAllocationPool.bigIntegerToIP(start));
+                "2003:0:0:0:0:0:0:1", NeutronSubnetIPAllocationPool.bigIntegerToIP(start));
     }
+
     @Test
     public void containsTest() {
         NeutronSubnetIPAllocationPool apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.4");
 
-        Assert.assertFalse("Contains Test 1: address one below pool start failed",
-              apUT.contains("10.18.0.1"));
+        Assert.assertFalse("Contains Test 1: address one below pool start failed", apUT.contains("10.18.0.1"));
 
-        Assert.assertTrue("Contains Test 2: address == pool start failed",
-              apUT.contains("10.18.0.2"));
+        Assert.assertTrue("Contains Test 2: address == pool start failed", apUT.contains("10.18.0.2"));
 
-        Assert.assertTrue("Contains Test 3: adress in pool failed",
-              apUT.contains("10.18.0.3"));
+        Assert.assertTrue("Contains Test 3: adress in pool failed", apUT.contains("10.18.0.3"));
 
-        Assert.assertTrue("Contains Test 4: address == pool end failed",
-              apUT.contains("10.18.0.4"));
+        Assert.assertTrue("Contains Test 4: address == pool end failed", apUT.contains("10.18.0.4"));
 
-        Assert.assertFalse("Contains Test 5: one above pool end failed",
-              apUT.contains("10.18.0.5"));
+        Assert.assertFalse("Contains Test 5: one above pool end failed", apUT.contains("10.18.0.5"));
     }
 
     @Test
@@ -81,19 +75,15 @@ public class NeutronSubnetIPAllocationPoolTest {
         apUT.setPoolEnd("2015:0:0:0:0:0:0:4");
 
         Assert.assertFalse("Contains V6 Test 1: address one below pool start failed",
-              apUT.containsV6("2015:0:0:0:0:0:0:1"));
+                apUT.containsV6("2015:0:0:0:0:0:0:1"));
 
-        Assert.assertTrue("Contains V6 Test 2: address == pool start failed",
-              apUT.containsV6("2015:0:0:0:0:0:0:2"));
+        Assert.assertTrue("Contains V6 Test 2: address == pool start failed", apUT.containsV6("2015:0:0:0:0:0:0:2"));
 
-        Assert.assertTrue("Contains V6 Test 3: adress in pool failed",
-              apUT.containsV6("2015:0:0:0:0:0:0:3"));
+        Assert.assertTrue("Contains V6 Test 3: adress in pool failed", apUT.containsV6("2015:0:0:0:0:0:0:3"));
 
-        Assert.assertTrue("Contains V6 Test 4: address == pool end failed",
-              apUT.containsV6("2015:0:0:0:0:0:0:4"));
+        Assert.assertTrue("Contains V6 Test 4: address == pool end failed", apUT.containsV6("2015:0:0:0:0:0:0:4"));
 
-        Assert.assertFalse("Contains V6 Test 5: one above pool end failed",
-              apUT.containsV6("2015:0:0:0:0:0:0:5"));
+        Assert.assertFalse("Contains V6 Test 5: one above pool end failed", apUT.containsV6("2015:0:0:0:0:0:0:5"));
     }
 
     @Test
@@ -102,68 +92,63 @@ public class NeutronSubnetIPAllocationPoolTest {
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.6");
         List<NeutronSubnetIPAllocationPool> result = apUT.splitPool("10.18.0.2");
-        Assert.assertEquals("splitPool Test 1.1: address == pool start (result size) failed",
-              1, result.size());
-        Assert.assertEquals("splitPool Test 1.2: address == pool start (pool start) failed",
-              "10.18.0.3", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPool Test 1.3: address == pool start (pool end) failed",
-              "10.18.0.6", result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPool Test 1.1: address == pool start (result size) failed", 1, result.size());
+        Assert.assertEquals("splitPool Test 1.2: address == pool start (pool start) failed", "10.18.0.3",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPool Test 1.3: address == pool start (pool end) failed", "10.18.0.6",
+                result.get(0).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.6");
         result = apUT.splitPool("10.18.0.3");
-        Assert.assertEquals("splitPool Test 2.1: address one above pool start (result size) failed",
-              2, result.size());
-        Assert.assertEquals("splitPool Test 2.2: address one above pool start (pool 1 start) failed",
-              "10.18.0.2", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPool Test 2.3: address one above pool start (pool 1 end) failed",
-              "10.18.0.2", result.get(0).getPoolEnd());
-        Assert.assertEquals("splitPool Test 2.4: address one above pool start (pool 2 start) failed",
-              "10.18.0.4", result.get(1).getPoolStart());
-        Assert.assertEquals("splitPool Test 2.5: address one above pool start (pool 2 end) failed",
-              "10.18.0.6", result.get(1).getPoolEnd());
+        Assert.assertEquals("splitPool Test 2.1: address one above pool start (result size) failed", 2, result.size());
+        Assert.assertEquals("splitPool Test 2.2: address one above pool start (pool 1 start) failed", "10.18.0.2",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPool Test 2.3: address one above pool start (pool 1 end) failed", "10.18.0.2",
+                result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPool Test 2.4: address one above pool start (pool 2 start) failed", "10.18.0.4",
+                result.get(1).getPoolStart());
+        Assert.assertEquals("splitPool Test 2.5: address one above pool start (pool 2 end) failed", "10.18.0.6",
+                result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.6");
         result = apUT.splitPool("10.18.0.4");
-        Assert.assertEquals("splitPool Test 3.1: address one above pool start (result size) failed",
-              2, result.size());
-        Assert.assertEquals("splitPool Test 3.2: address one above pool start (pool 1 start) failed",
-              "10.18.0.2", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPool Test 3.3: address one above pool start (pool 1 end) failed",
-              "10.18.0.3", result.get(0).getPoolEnd());
-        Assert.assertEquals("splitPool Test 3.4: address one above pool start (pool 2 start) failed",
-              "10.18.0.5", result.get(1).getPoolStart());
-        Assert.assertEquals("splitPool Test 3.5: address one above pool start (pool 2 end) failed",
-              "10.18.0.6", result.get(1).getPoolEnd());
+        Assert.assertEquals("splitPool Test 3.1: address one above pool start (result size) failed", 2, result.size());
+        Assert.assertEquals("splitPool Test 3.2: address one above pool start (pool 1 start) failed", "10.18.0.2",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPool Test 3.3: address one above pool start (pool 1 end) failed", "10.18.0.3",
+                result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPool Test 3.4: address one above pool start (pool 2 start) failed", "10.18.0.5",
+                result.get(1).getPoolStart());
+        Assert.assertEquals("splitPool Test 3.5: address one above pool start (pool 2 end) failed", "10.18.0.6",
+                result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.6");
         result = apUT.splitPool("10.18.0.5");
-        Assert.assertEquals("splitPool Test 4.1: address one above pool start (result size) failed",
-              2, result.size());
-        Assert.assertEquals("splitPool Test 4.2: address one above pool start (pool 1 start) failed",
-              "10.18.0.2", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPool Test 4.3: address one above pool start (pool 1 end) failed",
-              "10.18.0.4", result.get(0).getPoolEnd());
-        Assert.assertEquals("splitPool Test 4.4: address one above pool start (pool 2 start) failed",
-              "10.18.0.6", result.get(1).getPoolStart());
-        Assert.assertEquals("splitPool Test 4.5: address one above pool start (pool 2 end) failed",
-              "10.18.0.6", result.get(1).getPoolEnd());
+        Assert.assertEquals("splitPool Test 4.1: address one above pool start (result size) failed", 2, result.size());
+        Assert.assertEquals("splitPool Test 4.2: address one above pool start (pool 1 start) failed", "10.18.0.2",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPool Test 4.3: address one above pool start (pool 1 end) failed", "10.18.0.4",
+                result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPool Test 4.4: address one above pool start (pool 2 start) failed", "10.18.0.6",
+                result.get(1).getPoolStart());
+        Assert.assertEquals("splitPool Test 4.5: address one above pool start (pool 2 end) failed", "10.18.0.6",
+                result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("10.18.0.2");
         apUT.setPoolEnd("10.18.0.6");
         result = apUT.splitPool("10.18.0.6");
-        Assert.assertEquals("splitPool Test 5.1: address == pool start (result size) failed",
-              1, result.size());
-        Assert.assertEquals("splitPool Test 5.2: address == pool start (pool start) failed",
-              "10.18.0.2", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPool Test 5.3: address == pool start (pool end) failed",
-              "10.18.0.5", result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPool Test 5.1: address == pool start (result size) failed", 1, result.size());
+        Assert.assertEquals("splitPool Test 5.2: address == pool start (pool start) failed", "10.18.0.2",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPool Test 5.3: address == pool start (pool end) failed", "10.18.0.5",
+                result.get(0).getPoolEnd());
     }
 
     @Test
@@ -172,67 +157,65 @@ public class NeutronSubnetIPAllocationPoolTest {
         apUT.setPoolStart("2015:0:0:0:0:0:0:2");
         apUT.setPoolEnd("2015:0:0:0:0:0:0:6");
         List<NeutronSubnetIPAllocationPool> result = apUT.splitPoolV6("2015:0:0:0:0:0:0:2");
-        Assert.assertEquals("splitPoolV6 Test 1.1: address == pool start (result size) failed",
-              1, result.size());
-        Assert.assertEquals("splitPoolV6 Test 1.2: address == pool start (pool start) failed",
-              "2015:0:0:0:0:0:0:3", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPoolV6 Test 1.3: address == pool start (pool end) failed",
-              "2015:0:0:0:0:0:0:6", result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPoolV6 Test 1.1: address == pool start (result size) failed", 1, result.size());
+        Assert.assertEquals("splitPoolV6 Test 1.2: address == pool start (pool start) failed", "2015:0:0:0:0:0:0:3",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPoolV6 Test 1.3: address == pool start (pool end) failed", "2015:0:0:0:0:0:0:6",
+                result.get(0).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("2015:0:0:0:0:0:0:2");
         apUT.setPoolEnd("2015:0:0:0:0:0:0:6");
         result = apUT.splitPoolV6("2015:0:0:0:0:0:0:3");
-        Assert.assertEquals("splitPoolV6 Test 2.1: address one above pool start (result size) failed",
-              2, result.size());
+        Assert.assertEquals("splitPoolV6 Test 2.1: address one above pool start (result size) failed", 2,
+                result.size());
         Assert.assertEquals("splitPoolV6 Test 2.2: address one above pool start (pool 1 start) failed",
-              "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
+                "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 2.3: address one above pool start (pool 1 end) failed",
-              "2015:0:0:0:0:0:0:2", result.get(0).getPoolEnd());
+                "2015:0:0:0:0:0:0:2", result.get(0).getPoolEnd());
         Assert.assertEquals("splitPoolV6 Test 2.4: address one above pool start (pool 2 start) failed",
-              "2015:0:0:0:0:0:0:4", result.get(1).getPoolStart());
+                "2015:0:0:0:0:0:0:4", result.get(1).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 2.5: address one above pool start (pool 2 end) failed",
-              "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
+                "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("2015:0:0:0:0:0:0:2");
         apUT.setPoolEnd("2015:0:0:0:0:0:0:6");
         result = apUT.splitPoolV6("2015:0:0:0:0:0:0:4");
-        Assert.assertEquals("splitPoolV6 Test 3.1: address one above pool start (result size) failed",
-              2, result.size());
+        Assert.assertEquals("splitPoolV6 Test 3.1: address one above pool start (result size) failed", 2,
+                result.size());
         Assert.assertEquals("splitPoolV6 Test 3.2: address one above pool start (pool 1 start) failed",
-              "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
+                "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 3.3: address one above pool start (pool 1 end) failed",
-              "2015:0:0:0:0:0:0:3", result.get(0).getPoolEnd());
+                "2015:0:0:0:0:0:0:3", result.get(0).getPoolEnd());
         Assert.assertEquals("splitPoolV6 Test 3.4: address one above pool start (pool 2 start) failed",
-              "2015:0:0:0:0:0:0:5", result.get(1).getPoolStart());
+                "2015:0:0:0:0:0:0:5", result.get(1).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 3.5: address one above pool start (pool 2 end) failed",
-              "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
+                "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("2015:0:0:0:0:0:0:2");
         apUT.setPoolEnd("2015:0:0:0:0:0:0:6");
         result = apUT.splitPoolV6("2015:0:0:0:0:0:0:5");
-        Assert.assertEquals("splitPoolV6 Test 4.1: address one above pool start (result size) failed",
-              2, result.size());
+        Assert.assertEquals("splitPoolV6 Test 4.1: address one above pool start (result size) failed", 2,
+                result.size());
         Assert.assertEquals("splitPoolV6 Test 4.2: address one above pool start (pool 1 start) failed",
-              "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
+                "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 4.3: address one above pool start (pool 1 end) failed",
-              "2015:0:0:0:0:0:0:4", result.get(0).getPoolEnd());
+                "2015:0:0:0:0:0:0:4", result.get(0).getPoolEnd());
         Assert.assertEquals("splitPoolV6 Test 4.4: address one above pool start (pool 2 start) failed",
-              "2015:0:0:0:0:0:0:6", result.get(1).getPoolStart());
+                "2015:0:0:0:0:0:0:6", result.get(1).getPoolStart());
         Assert.assertEquals("splitPoolV6 Test 4.5: address one above pool start (pool 2 end) failed",
-              "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
+                "2015:0:0:0:0:0:0:6", result.get(1).getPoolEnd());
 
         apUT = new NeutronSubnetIPAllocationPool();
         apUT.setPoolStart("2015:0:0:0:0:0:0:2");
         apUT.setPoolEnd("2015:0:0:0:0:0:0:6");
         result = apUT.splitPoolV6("2015:0:0:0:0:0:0:6");
-        Assert.assertEquals("splitPoolV6 Test 5.1: address == pool start (result size) failed",
-              1, result.size());
-        Assert.assertEquals("splitPoolV6 Test 5.2: address == pool start (pool start) failed",
-              "2015:0:0:0:0:0:0:2", result.get(0).getPoolStart());
-        Assert.assertEquals("splitPoolV6 Test 5.3: address == pool start (pool end) failed",
-              "2015:0:0:0:0:0:0:5", result.get(0).getPoolEnd());
+        Assert.assertEquals("splitPoolV6 Test 5.1: address == pool start (result size) failed", 1, result.size());
+        Assert.assertEquals("splitPoolV6 Test 5.2: address == pool start (pool start) failed", "2015:0:0:0:0:0:0:2",
+                result.get(0).getPoolStart());
+        Assert.assertEquals("splitPoolV6 Test 5.3: address == pool start (pool end) failed", "2015:0:0:0:0:0:0:5",
+                result.get(0).getPoolEnd());
     }
 }
index 651fb46d6ec43ba46a3efac9a6c5b2aaeae38213..c1c73a6b98e7be1b1f5c2aca365409ee8990960e 100644 (file)
@@ -20,24 +20,22 @@ public class NeutronSubnetTest {
         NeutronSubnet objectUT = new NeutronSubnet();
         objectUT.setIpVersion(4);
         objectUT.setCidr("10.18.0.0/24");
-        Assert.assertTrue("isValidCIDR Test 1: Testing valid CIDR (10.18.0.0/24) failed",
-              objectUT.isValidCIDR());
+        Assert.assertTrue("isValidCIDR Test 1: Testing valid CIDR (10.18.0.0/24) failed", objectUT.isValidCIDR());
 
         objectUT.setCidr("10.18.0.0/16");
-        Assert.assertTrue("isValidCIDR Test 2: Testing valid CIDR (10.18.0.0/16) failed",
-              objectUT.isValidCIDR());
+        Assert.assertTrue("isValidCIDR Test 2: Testing valid CIDR (10.18.0.0/16) failed", objectUT.isValidCIDR());
 
         objectUT.setCidr("10.18.0.0/8");
         Assert.assertFalse("isValidCIDR Negative Test 1: Testing invalid CIDR (10.18.0.0/8) failed",
-              objectUT.isValidCIDR());
+                objectUT.isValidCIDR());
 
         objectUT.setIpVersion(6);
         objectUT.setCidr("2015:0:0:0:0:0:0:0/24");
         Assert.assertTrue("isValidCIDR Test 1: Testing valid V6 CIDR (2015:0:0:0:0:0:0:0/24) failed",
-              objectUT.isValidCIDR());
+                objectUT.isValidCIDR());
         objectUT.setCidr("2015:0:0:0:0:0:0:1/24");
         Assert.assertFalse("isValidCIDR Negative Test 1: Testing invalid CIDR (2015:0:0:0:0:0:0:1) failed",
-              objectUT.isValidCIDR());
+                objectUT.isValidCIDR());
     }
 
     @Test
@@ -55,15 +53,15 @@ public class NeutronSubnetTest {
 
         objectUT.setGatewayIP("10.18.0.1");
         Assert.assertFalse("gatewayIP_Pool_overlap Test 1: test with address below allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
 
         objectUT.setGatewayIP("10.18.0.4");
         Assert.assertTrue("gatewayIP_Pool_overlap Test 2: test with address in allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
 
         objectUT.setGatewayIP("10.18.0.7");
         Assert.assertFalse("gatewayIP_Pool_overlap Test 3: test with address above allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
 
         objectUT.setIpVersion(6);
         objectUT.setCidr("2015::0/64");
@@ -77,15 +75,15 @@ public class NeutronSubnetTest {
 
         objectUT.setGatewayIP("2015::1");
         Assert.assertFalse("gatewayIP_Pool_overlap v6 Test 1: test with address below allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
 
         objectUT.setGatewayIP("2015::4");
         Assert.assertTrue("gatewayIP_Pool_overlap v6 Test 2: test with address in allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
 
         objectUT.setGatewayIP("2015::7");
         Assert.assertFalse("gatewayIP_Pool_overlap v6 Test 3: test with address above allocation pool failed",
-              objectUT.gatewayIP_Pool_overlap());
+                objectUT.gatewayIP_Pool_overlap());
     }
 
     @Test
@@ -95,19 +93,19 @@ public class NeutronSubnetTest {
         objectUT.setCidr("10.18.0.0/24");
 
         Assert.assertFalse("isValidIP Negative Test 1: test of IP address outside of CIDR block failed",
-              objectUT.isValidIP("10.18.1.1"));
+                objectUT.isValidIP("10.18.1.1"));
 
         Assert.assertTrue("isValidIP Test 1: test of IP address within CIDR block failed",
-              objectUT.isValidIP("10.18.0.1"));
+                objectUT.isValidIP("10.18.0.1"));
 
         objectUT.setIpVersion(6);
         objectUT.setCidr("2015::0/64");
 
         Assert.assertFalse("isValidIP v6 Negative Test 1: test of IP address outside of CIDR block failed",
-              objectUT.isValidIP("2015:0:0:1:0:0:0:1"));
+                objectUT.isValidIP("2015:0:0:1:0:0:0:1"));
 
         Assert.assertTrue("isValidIP v6 Test 1: test of IP address within CIDR block failed",
-              objectUT.isValidIP("2015:0:0:0:1:0:0:1"));
+                objectUT.isValidIP("2015:0:0:0:1:0:0:1"));
     }
 
     @Test
@@ -126,8 +124,7 @@ public class NeutronSubnetTest {
         allocationPool.setPoolEnd("10.18.0.15");
         objectUT.setAllocationPools(aPools);
 
-        Assert.assertEquals("getLowAddr Test 1: test of returned address",
-              "10.18.0.2", objectUT.getLowAddr());
+        Assert.assertEquals("getLowAddr Test 1: test of returned address", "10.18.0.2", objectUT.getLowAddr());
 
         objectUT.setIpVersion(6);
         objectUT.setCidr("2015::0/24");
@@ -142,7 +139,6 @@ public class NeutronSubnetTest {
         allocationPool.setPoolEnd("2015::15");
         objectUT.setAllocationPools(aPools);
 
-        Assert.assertEquals("getLowAddr v6 Test 1: test of returned address",
-              "2015::2", objectUT.getLowAddr());
+        Assert.assertEquals("getLowAddr v6 Test 1: test of returned address", "2015::2", objectUT.getLowAddr());
     }
 }
index cf30c3c93ddc7e0a1658539f87d80d852b5ca0ff..a1282e9b48eb503744554daab2cbae953edb72c4 100644 (file)
@@ -13,24 +13,23 @@ import org.junit.Test;
 
 public class NeutronVPNDeadPeerDetectionJAXBTest {
 
-    private static final String NeutronVPNDeadPeerDetection_sourceJson = "{" +
-        "\"action\": \"hold\", " +
-        "\"interval\": 30, " +
-        "\"timeout\": 120 }";
+    private static final String NeutronVPNDeadPeerDetection_sourceJson = "{" + "\"action\": \"hold\", "
+            + "\"interval\": 30, " + "\"timeout\": 120 }";
 
     @Test
     public void test_NeutronVPNDeadPeerDetection_JAXB() {
         NeutronVPNDeadPeerDetection dummyObject = new NeutronVPNDeadPeerDetection();
         try {
-            NeutronVPNDeadPeerDetection testObject = (NeutronVPNDeadPeerDetection) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNDeadPeerDetection_sourceJson);
-            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 1: Testing action failed",
-                  "hold", testObject.getAction());
+            NeutronVPNDeadPeerDetection testObject = (NeutronVPNDeadPeerDetection) JaxbTestHelper
+                    .jaxbUnmarshall(dummyObject, NeutronVPNDeadPeerDetection_sourceJson);
+            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 1: Testing action failed", "hold",
+                    testObject.getAction());
 
-            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 2: Testing interval failed",
-                  new Integer(30), testObject.getInterval());
+            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 2: Testing interval failed", new Integer(30),
+                    testObject.getInterval());
 
-            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 3: Testing timeout failed",
-                  new Integer(120), testObject.getTimeout());
+            Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 3: Testing timeout failed", new Integer(120),
+                    testObject.getTimeout());
         } catch (Exception e) {
             Assert.fail("Tests failed");
         }
index 9882ea314fdbedf3288af1065d693b65699cf2b7..48ec93503456a5088dbaa00c6ad87c41d1e905cd 100644 (file)
@@ -12,52 +12,49 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronVPNIKEPolicyJAXBTest {
-    private static final String NeutronVPNIKEPolicy_sourceJson = "{" +
-        "\"id\": \"5522aff7-1b3c-48dd-9c3c-b50f016b73db\", " +
-        "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " +
-        "\"name\": \"ikepolicy1\", " +
-        "\"description\": \"updated description\", " +
-        "\"auth_algorithm\": \"sha1\", " +
-        "\"encryption_algorithm\": \"aes-256\", " +
-        "\"phase1_negotiation_mode\": \"main\", " +
-        "\"ike_version\": \"v1\", " +
-        "\"pfs\": \"group5\", " +
-        "\"lifetime\": { " + "\"units\": \"seconds\", " + "\"value\": 3600 " + "} }";
+    private static final String NeutronVPNIKEPolicy_sourceJson = "{"
+            + "\"id\": \"5522aff7-1b3c-48dd-9c3c-b50f016b73db\", "
+            + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " + "\"name\": \"ikepolicy1\", "
+            + "\"description\": \"updated description\", " + "\"auth_algorithm\": \"sha1\", "
+            + "\"encryption_algorithm\": \"aes-256\", " + "\"phase1_negotiation_mode\": \"main\", "
+            + "\"ike_version\": \"v1\", " + "\"pfs\": \"group5\", " + "\"lifetime\": { " + "\"units\": \"seconds\", "
+            + "\"value\": 3600 " + "} }";
 
     @Test
     public void test_NeutronVPNIKEPolicy_JAXB() {
         NeutronVPNIKEPolicy dummyObject = new NeutronVPNIKEPolicy();
         try {
-            NeutronVPNIKEPolicy testObject = (NeutronVPNIKEPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNIKEPolicy_sourceJson);
+            NeutronVPNIKEPolicy testObject = (NeutronVPNIKEPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronVPNIKEPolicy_sourceJson);
             Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 1: Testing id failed",
-                  "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID());
+                    "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID());
 
             Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 2: Testing tenant id failed",
-                  "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
+                    "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 3: Testing name failed",
-                  "ikepolicy1", testObject.getName());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 3: Testing name failed", "ikepolicy1",
+                    testObject.getName());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 5: Testing auth algorithm failed",
-                  "sha1", testObject.getAuthAlgorithm());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 5: Testing auth algorithm failed", "sha1",
+                    testObject.getAuthAlgorithm());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 6: Testing Encryption algorithm failed",
-                  "aes-256", testObject.getEncryptionAlgorithm());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 6: Testing Encryption algorithm failed", "aes-256",
+                    testObject.getEncryptionAlgorithm());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 7: Testing phase1 negotiation mode failed",
-                  "main", testObject.getPhase1NegotiationMode());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 7: Testing phase1 negotiation mode failed", "main",
+                    testObject.getPhase1NegotiationMode());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 8: Testing ike version failed",
-                  "v1", testObject.getIkeVersion());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 8: Testing ike version failed", "v1",
+                    testObject.getIkeVersion());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 9: Testing pfs failed",
-                  "group5", testObject.getPerfectForwardSecrecy());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 9: Testing pfs failed", "group5",
+                    testObject.getPerfectForwardSecrecy());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.1: Testing lifetime units value failed",
-                  "seconds", testObject.getLifetime().getUnits());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.1: Testing lifetime units value failed", "seconds",
+                    testObject.getLifetime().getUnits());
 
-            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.2: Testing lifetime values failed",
-                    new Integer(3600), testObject.getLifetime().getValue());
+            Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.2: Testing lifetime values failed", new Integer(3600),
+                    testObject.getLifetime().getValue());
         } catch (Exception e) {
             Assert.fail("Tests failed");
         }
index bd12189a56041ccd91142b6967779656cc7a445b..39632638bf83a631fb8e0c529370b2b792cb8951 100644 (file)
@@ -13,52 +13,49 @@ import org.junit.Test;
 
 public class NeutronVPNIPSECPolicyJAXBTest {
 
-    private static final String NeutronVPNIPSECPolicy_SingleProvider_sourceJson = "{" +
-        "\"id\": \"5291b189-fd84-46e5-84bd-78f40c05d69c\", " +
-        "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " +
-        "\"name\": \"ipsecpolicy1\", " +
-        "\"description\": \"update description\", " +
-        "\"transform_protocol\": \"esp\", " +
-        "\"encapsulation_mode\": \"tunnel\", " +
-        "\"auth_algorithm\": \"sha1\", " +
-        "\"encryption_algorithm\": \"aes-128\", " +
-        "\"pfs\": \"group5\", " +
-        "\"lifetime\": { " + "\"units\": \"seconds\", " + "\"value\": 3600 " + "} }";
+    private static final String NeutronVPNIPSECPolicy_SingleProvider_sourceJson = "{"
+            + "\"id\": \"5291b189-fd84-46e5-84bd-78f40c05d69c\", "
+            + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " + "\"name\": \"ipsecpolicy1\", "
+            + "\"description\": \"update description\", " + "\"transform_protocol\": \"esp\", "
+            + "\"encapsulation_mode\": \"tunnel\", " + "\"auth_algorithm\": \"sha1\", "
+            + "\"encryption_algorithm\": \"aes-128\", " + "\"pfs\": \"group5\", " + "\"lifetime\": { "
+            + "\"units\": \"seconds\", " + "\"value\": 3600 " + "} }";
 
     @Test
     public void test_NeutronVPNIPSECPolicy_JAXB() {
         NeutronVPNIPSECPolicy dummyObject = new NeutronVPNIPSECPolicy();
         try {
-            NeutronVPNIPSECPolicy testObject = (NeutronVPNIPSECPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNIPSECPolicy_SingleProvider_sourceJson);
+            NeutronVPNIPSECPolicy testObject = (NeutronVPNIPSECPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronVPNIPSECPolicy_SingleProvider_sourceJson);
             Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 1: Testing id failed",
-                  "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID());
+                    "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID());
 
             Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 2: Testing tenant id failed",
-                  "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
+                    "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 3: Testing name failed",
-                  "ipsecpolicy1", testObject.getName());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 3: Testing name failed", "ipsecpolicy1",
+                    testObject.getName());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 5: Testing transform protocol failed",
-                  "esp", testObject.getTransformProtocol());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 5: Testing transform protocol failed", "esp",
+                    testObject.getTransformProtocol());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 6: Testing encapsulation mode failed",
-                  "tunnel", testObject.getEncapsulationMode());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 6: Testing encapsulation mode failed", "tunnel",
+                    testObject.getEncapsulationMode());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 7: Testing authorization algorithm failed",
-                  "sha1", testObject.getAuthAlgorithm());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 7: Testing authorization algorithm failed", "sha1",
+                    testObject.getAuthAlgorithm());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 8: Testing encryption algorithm failed",
-                  "aes-128", testObject.getEncryptionAlgorithm());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 8: Testing encryption algorithm failed", "aes-128",
+                    testObject.getEncryptionAlgorithm());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 9: Testing PerfectForwardSecrecy failed",
-                  "group5", testObject.getPerfectForwardSecrecy());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 9: Testing PerfectForwardSecrecy failed", "group5",
+                    testObject.getPerfectForwardSecrecy());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 10: Testing Lifetime unit value failed",
-                  "seconds", testObject.getLifetime().getUnits());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 10: Testing Lifetime unit value failed", "seconds",
+                    testObject.getLifetime().getUnits());
 
-            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 11: Testing Lifetime value failed",
-                  new Integer(3600), testObject.getLifetime().getValue());
+            Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 11: Testing Lifetime value failed", new Integer(3600),
+                    testObject.getLifetime().getValue());
         } catch (Exception e) {
             Assert.fail("Tests failed");
         }
index 7fae5f534297822c5d6bdb3cadd43e950cad175b..d9b20a8ad50b80ee9a27f0f1bc3e38181828df69 100644 (file)
@@ -14,93 +14,86 @@ import org.junit.Test;
 
 public class NeutronVPNIPSECSiteConnectionJAXBTest {
 
-    private static final String NeutronVPNIPSECSiteConnection_sourceJson = "{" +
-        "\"id\": \"cbc152a0-7e93-4f98-9f04-b085a4bf2511\", " +
-        "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " +
-        "\"name\": \"myvpn\", " +
-        "\"description\": \"Updated description\", " +
-        "\"peer_address\": \"172.24.4.226\", " +
-        "\"peer_id\": \"172.24.4.226\", " +
-        "\"peer_cidrs\": [\"10.1.0.0/24\"], " +
-        "\"route_mode\": \"static\", " +
-        "\"mtu\": 1500 ," +
-        "\"auth_mode\": \"psk\", " +
-        "\"psk\": \"secret\"," +
-        "\"initiator\": \"bi-directional\", " +
-        "\"admin_state_up\": true , " +
-        "\"status\": \"PENDING_CREATE\", " +
-        "\"ikepolicy_id\": \"bf5612ac-15fb-460c-9b3d-6453da2fafa2\", " +
-        "\"ipsecpolicy_id\": \"8ba867b2-67eb-4835-bb61-c226804a1584\", " +
-        "\"vpnservice_id\": \"c2f3178d-5530-4c4a-89fc-050ecd552636\", " +
-        "\"dpd\": { " + "\"action\": \"hold\", " + "\"interval\": 30 ," + "\"timeout\": 120 " + "} }";
+    private static final String NeutronVPNIPSECSiteConnection_sourceJson = "{"
+            + "\"id\": \"cbc152a0-7e93-4f98-9f04-b085a4bf2511\", "
+            + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " + "\"name\": \"myvpn\", "
+            + "\"description\": \"Updated description\", " + "\"peer_address\": \"172.24.4.226\", "
+            + "\"peer_id\": \"172.24.4.226\", " + "\"peer_cidrs\": [\"10.1.0.0/24\"], " + "\"route_mode\": \"static\", "
+            + "\"mtu\": 1500 ," + "\"auth_mode\": \"psk\", " + "\"psk\": \"secret\","
+            + "\"initiator\": \"bi-directional\", " + "\"admin_state_up\": true , " + "\"status\": \"PENDING_CREATE\", "
+            + "\"ikepolicy_id\": \"bf5612ac-15fb-460c-9b3d-6453da2fafa2\", "
+            + "\"ipsecpolicy_id\": \"8ba867b2-67eb-4835-bb61-c226804a1584\", "
+            + "\"vpnservice_id\": \"c2f3178d-5530-4c4a-89fc-050ecd552636\", " + "\"dpd\": { " + "\"action\": \"hold\", "
+            + "\"interval\": 30 ," + "\"timeout\": 120 " + "} }";
 
     @Test
     public void test_NeutronVPNIPSECSiteConnection_JAXB() {
         NeutronVPNIPSECSiteConnection dummyObject = new NeutronVPNIPSECSiteConnection();
         try {
 
-            NeutronVPNIPSECSiteConnection testObject = (NeutronVPNIPSECSiteConnection) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNIPSECSiteConnection_sourceJson);
+            NeutronVPNIPSECSiteConnection testObject = (NeutronVPNIPSECSiteConnection) JaxbTestHelper
+                    .jaxbUnmarshall(dummyObject, NeutronVPNIPSECSiteConnection_sourceJson);
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 1: Testing id failed",
-                  "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID());
+                    "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 2: Testing tenant id failed",
-                  "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
+                    "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 3: Testing name failed",
-                  "myvpn", testObject.getName());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 3: Testing name failed", "myvpn",
+                    testObject.getName());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 5: Testing peer address failed",
-                  "172.24.4.226", testObject.getPeerAddress());
+                    "172.24.4.226", testObject.getPeerAddress());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 6: Testing peer id failed",
-                  "172.24.4.226", testObject.getPeerID());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 6: Testing peer id failed", "172.24.4.226",
+                    testObject.getPeerID());
 
             List<String> peerCidrs = testObject.getPeerCidrs();
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 7: Testing peerCidrs size failed",
-                  1, peerCidrs.size());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 7: Testing peerCidrs size failed", 1,
+                    peerCidrs.size());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection Test 8.1: Testing peerCidrs value failed",
-                  "10.1.0.0/24", peerCidrs.get(0));
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection Test 8.1: Testing peerCidrs value failed", "10.1.0.0/24",
+                    peerCidrs.get(0));
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 8.2: Testing list value failed",
-                  "static", testObject.getRouteMode());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 8.2: Testing list value failed", "static",
+                    testObject.getRouteMode());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 9: Testing mtu failed",
-                  1500, (long) testObject.getMtu());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 9: Testing mtu failed", 1500,
+                    (long) testObject.getMtu());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 10: Testing authmode failed",
-                  "psk", testObject.getAuthMode());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 10: Testing authmode failed", "psk",
+                    testObject.getAuthMode());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 11: Testing presharedkey failed",
-                  "secret", testObject.getPreSharedKey());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 11: Testing presharedkey failed", "secret",
+                    testObject.getPreSharedKey());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 12: Testing initiator failed",
-                  "bi-directional", testObject.getInitiator());
+                    "bi-directional", testObject.getInitiator());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 13: Testing Admin state failed",
-                  true, testObject.getAdminStateUp());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 13: Testing Admin state failed", true,
+                    testObject.getAdminStateUp());
 
-            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 14: Testing status failed",
-                  "PENDING_CREATE", testObject.getStatus());
+            Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 14: Testing status failed", "PENDING_CREATE",
+                    testObject.getStatus());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 15: Testing IkePolicyID failed",
-                  "bf5612ac-15fb-460c-9b3d-6453da2fafa2", testObject.getIkePolicyID());
+                    "bf5612ac-15fb-460c-9b3d-6453da2fafa2", testObject.getIkePolicyID());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 16: Testing IpsecPolicyID failed",
-                  "8ba867b2-67eb-4835-bb61-c226804a1584", testObject.getIpsecPolicyID());
+                    "8ba867b2-67eb-4835-bb61-c226804a1584", testObject.getIpsecPolicyID());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 17: Testing VpnServiceID failed",
-                  "c2f3178d-5530-4c4a-89fc-050ecd552636", testObject.getVpnServiceID());
+                    "c2f3178d-5530-4c4a-89fc-050ecd552636", testObject.getVpnServiceID());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.1: Testing DeadPeerDetection failed",
-                  "hold", testObject.getDeadPeerDetection().getAction());
+                    "hold", testObject.getDeadPeerDetection().getAction());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.2: Testing DeadPeerDetection failed",
-                  new Integer(30), testObject.getDeadPeerDetection().getInterval());
+                    new Integer(30), testObject.getDeadPeerDetection().getInterval());
 
             Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.3: Testing DeadPeerDetection failed",
-                  new Integer(120), testObject.getDeadPeerDetection().getTimeout());
+                    new Integer(120), testObject.getDeadPeerDetection().getTimeout());
         } catch (Exception e) {
             Assert.fail("Tests failed");
         }
index 436acd97890456158ea5dceda1f794a19d66695e..5c9c775299a49744b97308ecf6527953c827d736 100644 (file)
@@ -13,20 +13,20 @@ import org.junit.Test;
 
 public class NeutronVPNLifetimeJAXBTest {
 
-    private static final String NeutronVPNLifetimeTest_sourceJson = "{" +
-        "\"units\": \"seconds\", " +
-        "\"value\": 3600 }";
+    private static final String NeutronVPNLifetimeTest_sourceJson = "{" + "\"units\": \"seconds\", "
+            + "\"value\": 3600 }";
 
     @Test
     public void test_NeutronVPNLifetime_JAXB() {
         NeutronVPNLifetime dummyObject = new NeutronVPNLifetime();
         try {
-            NeutronVPNLifetime testObject = (NeutronVPNLifetime) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNLifetimeTest_sourceJson);
-            Assert.assertEquals("NeutronVPNLifetime JAXB Test 1: Testing units failed",
-                  "seconds", testObject.getUnits());
+            NeutronVPNLifetime testObject = (NeutronVPNLifetime) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronVPNLifetimeTest_sourceJson);
+            Assert.assertEquals("NeutronVPNLifetime JAXB Test 1: Testing units failed", "seconds",
+                    testObject.getUnits());
 
-            Assert.assertEquals("NeutronVPNLifetime JAXB Test 2: Testing value failed",
-                  new Integer(3600), testObject.getValue());
+            Assert.assertEquals("NeutronVPNLifetime JAXB Test 2: Testing value failed", new Integer(3600),
+                    testObject.getValue());
         } catch (Exception e) {
             Assert.fail("Tests failed");
         }
index 27666e7c982ed339393d3908e2311db74544aa6c..a67289b762221d8f045db9e63e81c9193b8de4ac 100644 (file)
@@ -13,43 +13,40 @@ import org.junit.Test;
 
 public class NeutronVPNServiceJAXBTest {
 
-    private static final String NeutronVPNService_sourceJson = "{" +
-        "\"router_id\": \"ec8619be-0ba8-4955-8835-3b49ddb76f89\", " +
-        "\"status\": \"PENDING_CREATE\", " +
-        "\"name\": \"myservice\", " +
-        "\"admin_state_up\": true, " +
-        "\"subnet_id\": \"f4fb4528-ed93-467c-a57b-11c7ea9f963e\", " +
-        "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", " +
-        "\"id\": \"9faaf49f-dd89-4e39-a8c6-101839aa49bc\", " +
-        "\"description\": \"Updated description\" }";
+    private static final String NeutronVPNService_sourceJson = "{"
+            + "\"router_id\": \"ec8619be-0ba8-4955-8835-3b49ddb76f89\", " + "\"status\": \"PENDING_CREATE\", "
+            + "\"name\": \"myservice\", " + "\"admin_state_up\": true, "
+            + "\"subnet_id\": \"f4fb4528-ed93-467c-a57b-11c7ea9f963e\", "
+            + "\"tenant_id\": \"ccb81365fe36411a9011e90491fe1330\", "
+            + "\"id\": \"9faaf49f-dd89-4e39-a8c6-101839aa49bc\", " + "\"description\": \"Updated description\" }";
 
     @Test
     public void test_NeutronVPNService_JAXB() {
         NeutronVPNService dummyObject = new NeutronVPNService();
         try {
-            NeutronVPNService testObject = (NeutronVPNService) JaxbTestHelper.jaxbUnmarshall(dummyObject, NeutronVPNService_sourceJson);
+            NeutronVPNService testObject = (NeutronVPNService) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+                    NeutronVPNService_sourceJson);
             Assert.assertEquals("NeutronVPNService JAXB Test 1: Testing router id failed",
-                  "ec8619be-0ba8-4955-8835-3b49ddb76f89", testObject.getRouterUUID());
+                    "ec8619be-0ba8-4955-8835-3b49ddb76f89", testObject.getRouterUUID());
 
-            Assert.assertEquals("NeutronVPNService JAXB Test 2: Testing status failed",
-                  "PENDING_CREATE", testObject.getStatus());
+            Assert.assertEquals("NeutronVPNService JAXB Test 2: Testing status failed", "PENDING_CREATE",
+                    testObject.getStatus());
 
-            Assert.assertEquals("NeutronVPNService JAXB Test 3: Testing name failed",
-                  "myservice", testObject.getName());
+            Assert.assertEquals("NeutronVPNService JAXB Test 3: Testing name failed", "myservice",
+                    testObject.getName());
 
-            Assert.assertEquals("NeutronVPNService JAXB Test 4: Testing admin state up failed",
-                  true, testObject.getAdminStateUp());
+            Assert.assertEquals("NeutronVPNService JAXB Test 4: Testing admin state up failed", true,
+                    testObject.getAdminStateUp());
 
             Assert.assertEquals("NeutronVPNService JAXB Test 5: Testing Subnet UUID failed",
-                  "f4fb4528-ed93-467c-a57b-11c7ea9f963e", testObject.getSubnetUUID());
+                    "f4fb4528-ed93-467c-a57b-11c7ea9f963e", testObject.getSubnetUUID());
 
             Assert.assertEquals("NeutronVPNService JAXB Test 6: Testing Tenant Id failed",
-                  "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
+                    "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
 
             Assert.assertEquals("NeutronVPNService JAXB Test 7: Testing id failed",
-                  "9faaf49f-dd89-4e39-a8c6-101839aa49bc", testObject.getID());
-        }
-        catch (Exception e) {
+                    "9faaf49f-dd89-4e39-a8c6-101839aa49bc", testObject.getID());
+        } catch (Exception e) {
             Assert.fail("Tests failed");
         }
     }
index 888fcbd6fcb35c37a2932ba67765525857706581..85a0ac3c18bf50d0d059e8315eae22faedd16ad5 100644 (file)
@@ -13,9 +13,8 @@ import org.junit.Test;
 
 public class Neutron_IDJAXBTest {
 
-    private static final String Neutron_ID_sourceJson = "{ " +
-
-    "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
+    private static final String Neutron_ID_sourceJson =
+            "{ \"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }";
 
     @Test
     public void test_Neutron_ID_JAXB() {
index 5780bedc88a0ed0f4f8438531fc04c650c431d5d..98e819a077ae24cc14fa2deedefb0676dad6f129 100644 (file)
@@ -13,9 +13,8 @@ import org.junit.Test;
 
 public class Neutron_IPsJAXBTest {
 
-    private static final String Neutron_IPs_sourceJson = "{ " +
-
-    "\"ip_address\": \"192.168.111.3\", " + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" }";
+    private static final String Neutron_IPs_sourceJson =
+            "{ \"ip_address\": \"192.168.111.3\", " + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" }";
 
     @Test
     public void test_Neutron_IPs_JAXB() {