cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [5/6] git commit: updated refs/heads/master to 256763c
Date Mon, 04 Nov 2013 14:25:08 GMT
Fix checkstyle errors in Nicira NVP plugin


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/256763cf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/256763cf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/256763cf

Branch: refs/heads/master
Commit: 256763cf65beb9f9ee4dc74b720f1819017f83d9
Parents: f39b6b2
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Mon Nov 4 15:23:02 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Mon Nov 4 15:24:54 2013 +0100

----------------------------------------------------------------------
 .../cloudstack/nvp/spring-nvp-context.xml       |    2 +-
 ...ortForwardingRulesOnLogicalRouterAnswer.java |   18 +-
 ...rtForwardingRulesOnLogicalRouterCommand.java |   69 +-
 ...ConfigurePublicIpsOnLogicalRouterAnswer.java |   13 +-
 ...onfigurePublicIpsOnLogicalRouterCommand.java |   80 +-
 ...gureStaticNatRulesOnLogicalRouterAnswer.java |   36 +-
 ...ureStaticNatRulesOnLogicalRouterCommand.java |   74 +-
 .../agent/api/CreateLogicalRouterAnswer.java    |    8 +-
 .../agent/api/CreateLogicalRouterCommand.java   |  178 +-
 .../agent/api/CreateLogicalSwitchAnswer.java    |    4 +-
 .../agent/api/CreateLogicalSwitchCommand.java   |   10 +-
 .../api/CreateLogicalSwitchPortAnswer.java      |    6 +-
 .../api/CreateLogicalSwitchPortCommand.java     |   14 +-
 .../agent/api/DeleteLogicalRouterAnswer.java    |    6 +-
 .../agent/api/DeleteLogicalRouterCommand.java   |   37 +-
 .../agent/api/DeleteLogicalSwitchCommand.java   |    6 +-
 .../api/DeleteLogicalSwitchPortCommand.java     |   10 +-
 .../agent/api/FindLogicalSwitchPortAnswer.java  |    6 +-
 .../agent/api/FindLogicalSwitchPortCommand.java |   16 +-
 .../api/UpdateLogicalSwitchPortAnswer.java      |    6 +-
 .../api/UpdateLogicalSwitchPortCommand.java     |   16 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |   45 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |   24 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |    8 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java   |   14 +-
 .../api/response/NiciraNvpDeviceResponse.java   |   30 +-
 .../com/cloud/network/NiciraNvpDeviceVO.java    |   25 +-
 .../cloud/network/NiciraNvpNicMappingVO.java    |   17 +-
 .../cloud/network/NiciraNvpRouterMappingVO.java |   92 +-
 .../com/cloud/network/dao/NiciraNvpDaoImpl.java |    6 +-
 .../network/dao/NiciraNvpNicMappingDao.java     |    9 +-
 .../network/dao/NiciraNvpNicMappingDaoImpl.java |    6 +-
 .../network/dao/NiciraNvpRouterMappingDao.java  |    2 +-
 .../dao/NiciraNvpRouterMappingDaoImpl.java      |   29 +-
 .../cloud/network/element/NiciraNvpElement.java |   38 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |    1 -
 .../network/nicira/ControlClusterStatus.java    |  108 +-
 .../network/nicira/DestinationNatRule.java      |    5 +-
 .../network/nicira/L3GatewayAttachment.java     |   60 +-
 .../network/nicira/LogicalRouterConfig.java     |   53 +-
 .../cloud/network/nicira/LogicalRouterPort.java |  132 +-
 .../com/cloud/network/nicira/LogicalSwitch.java |   28 +-
 .../cloud/network/nicira/LogicalSwitchPort.java |    4 +-
 .../src/com/cloud/network/nicira/Match.java     |  238 ++-
 .../src/com/cloud/network/nicira/NatRule.java   |   14 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |  351 ++--
 .../com/cloud/network/nicira/NiciraNvpList.java |    4 +-
 .../com/cloud/network/nicira/NiciraNvpTag.java  |   14 +-
 .../cloud/network/nicira/PatchAttachment.java   |   31 +-
 .../com/cloud/network/nicira/RouterNextHop.java |   34 +-
 .../SingleDefaultRouteImplictRoutingConfig.java |   34 +-
 .../com/cloud/network/nicira/SourceNatRule.java |    4 +-
 .../network/nicira/TransportZoneBinding.java    |    6 +-
 .../com/cloud/network/nicira/VifAttachment.java |    8 +-
 .../network/resource/NiciraNvpResource.java     |  978 +++++------
 .../network/element/NiciraNvpElementTest.java   |   21 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |  811 ++++-----
 .../com/cloud/network/nicira/NatRuleTest.java   |   16 +-
 .../cloud/network/nicira/NiciraNvpApiTest.java  |  542 ++++---
 .../network/resource/NiciraNvpResourceTest.java | 1533 +++++++++---------
 60 files changed, 2993 insertions(+), 2997 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml b/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml
index 302b072..8d9813a 100644
--- a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml
+++ b/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml
@@ -36,5 +36,5 @@
     <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
         <property name="name" value="NiciraNvp" />
     </bean>
-    
+
 </beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java
index 40bde6c..94931a0 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,18 +17,16 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class ConfigurePortForwardingRulesOnLogicalRouterAnswer extends Answer {
 
-	public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command,
-			boolean success, String details) {
-		super(command, success, details);
-	}
+    public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command, boolean success, String details) {
+        super(command, success, details);
+    }
 
-	public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command,
-			Exception e) {
-		super(command, e);
-	}
+    public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command, Exception e) {
+        super(command, e);
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
index 5f0ea38..16ef2c4 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -21,40 +21,41 @@ import java.util.List;
 import com.cloud.agent.api.to.PortForwardingRuleTO;
 
 /**
- * 
+ *
  */
 public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command {
-	
-	private String logicalRouterUuid;
-	private List<PortForwardingRuleTO> rules;
-
-	public ConfigurePortForwardingRulesOnLogicalRouterCommand(String logicalRouterUuid, List<PortForwardingRuleTO> rules) {
-		this.logicalRouterUuid = logicalRouterUuid;
-		this.rules = rules;
-	}
-	
-	public String getLogicalRouterUuid() {
-		return logicalRouterUuid;
-	}
-
-	public void setLogicalRouterUuid(String logicalRouterUuid) {
-		this.logicalRouterUuid = logicalRouterUuid;
-	}
-
-	public List<PortForwardingRuleTO> getRules() {
-		return rules;
-	}
-
-	public void setRules(List<PortForwardingRuleTO> rules) {
-		this.rules = rules;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.cloud.agent.api.Command#executeInSequence()
-	 */
-	@Override
-	public boolean executeInSequence() {
-		return false;
-	}
+
+    private String logicalRouterUuid;
+    private List<PortForwardingRuleTO> rules;
+
+    public ConfigurePortForwardingRulesOnLogicalRouterCommand(String logicalRouterUuid, List<PortForwardingRuleTO> rules) {
+        this.logicalRouterUuid = logicalRouterUuid;
+        this.rules = rules;
+    }
+
+    public String getLogicalRouterUuid() {
+        return logicalRouterUuid;
+    }
+
+    public void setLogicalRouterUuid(String logicalRouterUuid) {
+        this.logicalRouterUuid = logicalRouterUuid;
+    }
+
+    public List<PortForwardingRuleTO> getRules() {
+        return rules;
+    }
+
+    public void setRules(List<PortForwardingRuleTO> rules) {
+        this.rules = rules;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.cloud.agent.api.Command#executeInSequence()
+     */
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java
index 12b1a1f..09a3e7e 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java
@@ -18,13 +18,12 @@ package com.cloud.agent.api;
 
 public class ConfigurePublicIpsOnLogicalRouterAnswer extends Answer {
 
-	public ConfigurePublicIpsOnLogicalRouterAnswer(Command command,
-			boolean success, String details) {
-		super(command, success, details);
-	}
+    public ConfigurePublicIpsOnLogicalRouterAnswer(Command command, boolean success, String details) {
+        super(command, success, details);
+    }
 
-	public ConfigurePublicIpsOnLogicalRouterAnswer(Command command, Exception e) {
-		super(command, e);
-	}
+    public ConfigurePublicIpsOnLogicalRouterAnswer(Command command, Exception e) {
+        super(command, e);
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
index 8ee3793..c08f540 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
@@ -19,47 +19,45 @@ package com.cloud.agent.api;
 import java.util.List;
 
 public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
-	
-	private String logicalRouterUuid;
-	private String l3GatewayServiceUuid;
-	private List<String> publicCidrs;
-	
-	public ConfigurePublicIpsOnLogicalRouterCommand(String logicalRouterUuid,
-			String l3GatewayServiceUuid,
-			List<String> publicCidrs) {
-		super();
-		this.logicalRouterUuid = logicalRouterUuid;
-		this.publicCidrs = publicCidrs;
-		this.l3GatewayServiceUuid = l3GatewayServiceUuid;
-	}
 
-	public String getLogicalRouterUuid() {
-		return logicalRouterUuid;
-	}
-
-	public void setLogicalRouterUuid(String logicalRouterUuid) {
-		this.logicalRouterUuid = logicalRouterUuid;
-	}
-	
-	public String getL3GatewayServiceUuid() {
-		return l3GatewayServiceUuid;
-	}
-
-	public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
-		this.l3GatewayServiceUuid = l3GatewayServiceUuid;
-	}
-
-	public List<String> getPublicCidrs() {
-		return publicCidrs;
-	}
-
-	public void setPublicCidrs(List<String> publicCidrs) {
-		this.publicCidrs = publicCidrs;
-	}
-
-	@Override
-	public boolean executeInSequence() {
-		return false;
-	}
+    private String logicalRouterUuid;
+    private String l3GatewayServiceUuid;
+    private List<String> publicCidrs;
+
+    public ConfigurePublicIpsOnLogicalRouterCommand(String logicalRouterUuid, String l3GatewayServiceUuid, List<String> publicCidrs) {
+        super();
+        this.logicalRouterUuid = logicalRouterUuid;
+        this.publicCidrs = publicCidrs;
+        this.l3GatewayServiceUuid = l3GatewayServiceUuid;
+    }
+
+    public String getLogicalRouterUuid() {
+        return logicalRouterUuid;
+    }
+
+    public void setLogicalRouterUuid(String logicalRouterUuid) {
+        this.logicalRouterUuid = logicalRouterUuid;
+    }
+
+    public String getL3GatewayServiceUuid() {
+        return l3GatewayServiceUuid;
+    }
+
+    public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
+        this.l3GatewayServiceUuid = l3GatewayServiceUuid;
+    }
+
+    public List<String> getPublicCidrs() {
+        return publicCidrs;
+    }
+
+    public void setPublicCidrs(List<String> publicCidrs) {
+        this.publicCidrs = publicCidrs;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java
index 463dd46..caab316 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,27 +17,25 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class ConfigureStaticNatRulesOnLogicalRouterAnswer extends Answer {
 
-	/**
-	 * @param command
-	 * @param success
-	 * @param details
-	 */
-	public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command,
-			boolean success, String details) {
-		super(command, success, details);
-	}
+    /**
+     * @param command
+     * @param success
+     * @param details
+     */
+    public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command, boolean success, String details) {
+        super(command, success, details);
+    }
 
-	/**
-	 * @param command
-	 * @param e
-	 */
-	public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command,
-			Exception e) {
-		super(command, e);
-	}
+    /**
+     * @param command
+     * @param e
+     */
+    public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command, Exception e) {
+        super(command, e);
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
index 960f609..5f79ffc 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -21,43 +21,43 @@ import java.util.List;
 import com.cloud.agent.api.to.StaticNatRuleTO;
 
 /**
- * 
+ *
  */
 public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command {
-	
-	private String logicalRouterUuid;
-	private List<StaticNatRuleTO> rules;
-
-	public ConfigureStaticNatRulesOnLogicalRouterCommand(
-			String logicalRouterUuid, List<StaticNatRuleTO> rules) {
-		super();
-		this.logicalRouterUuid = logicalRouterUuid;
-		this.rules = rules;
-
-	}
-
-	public String getLogicalRouterUuid() {
-		return logicalRouterUuid;
-	}
-
-	public void setLogicalRouterUuid(String logicalRouterUuid) {
-		this.logicalRouterUuid = logicalRouterUuid;
-	}
-
-	public List<StaticNatRuleTO> getRules() {
-		return rules;
-	}
-
-	public void setRules(List<StaticNatRuleTO> rules) {
-		this.rules = rules;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.cloud.agent.api.Command#executeInSequence()
-	 */
-	@Override
-	public boolean executeInSequence() {
-		return false;
-	}
+
+    private String logicalRouterUuid;
+    private List<StaticNatRuleTO> rules;
+
+    public ConfigureStaticNatRulesOnLogicalRouterCommand(String logicalRouterUuid, List<StaticNatRuleTO> rules) {
+        super();
+        this.logicalRouterUuid = logicalRouterUuid;
+        this.rules = rules;
+
+    }
+
+    public String getLogicalRouterUuid() {
+        return logicalRouterUuid;
+    }
+
+    public void setLogicalRouterUuid(String logicalRouterUuid) {
+        this.logicalRouterUuid = logicalRouterUuid;
+    }
+
+    public List<StaticNatRuleTO> getRules() {
+        return rules;
+    }
+
+    public void setRules(List<StaticNatRuleTO> rules) {
+        this.rules = rules;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.cloud.agent.api.Command#executeInSequence()
+     */
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java
index 4a09e44..72a275b 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,7 +17,7 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class CreateLogicalRouterAnswer extends Answer {
 
@@ -26,9 +26,9 @@ public class CreateLogicalRouterAnswer extends Answer {
     public CreateLogicalRouterAnswer(Command command, boolean success,
             String details, String logicalRouterUuid) {
         super(command, success, details);
-        this._logicalRouterUuid = logicalRouterUuid;
+        _logicalRouterUuid = logicalRouterUuid;
     }
-    
+
     public CreateLogicalRouterAnswer(Command command, Exception e) {
         super(command, e);
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java
index 57440df..1f3f24e 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,99 +17,99 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class CreateLogicalRouterCommand extends Command {
-	private String _gatewayServiceUuid;
-	private String _logicalSwitchUuid;
-	private long _vlanId;
-	private String _name;
-	private String _ownerName;
-	private String _publicIpCidr;
-	private String _publicNextHop;
-	private String _internalIpCidr;
-	
-	public CreateLogicalRouterCommand(String gatewayServiceUuid, long vlanId,
-			String logicalSwitchUuid, String name, 
-			String publicIpCidr, String publicNextHop, 
-			String internalIpCidr, String ownerName) {
-		super();
-		this._gatewayServiceUuid = gatewayServiceUuid;
-		this._logicalSwitchUuid = logicalSwitchUuid;
-		this._vlanId = vlanId;
-		this._name = name;
-		this._ownerName = ownerName;
-		this._publicIpCidr = publicIpCidr;
-		this._publicNextHop = publicNextHop;
-		this._internalIpCidr = internalIpCidr;
-	}
-	
+    private String _gatewayServiceUuid;
+    private String _logicalSwitchUuid;
+    private long _vlanId;
+    private String _name;
+    private String _ownerName;
+    private String _publicIpCidr;
+    private String _publicNextHop;
+    private String _internalIpCidr;
+
+    public CreateLogicalRouterCommand(String gatewayServiceUuid, long vlanId,
+            String logicalSwitchUuid, String name,
+            String publicIpCidr, String publicNextHop,
+            String internalIpCidr, String ownerName) {
+        super();
+        _gatewayServiceUuid = gatewayServiceUuid;
+        _logicalSwitchUuid = logicalSwitchUuid;
+        _vlanId = vlanId;
+        _name = name;
+        _ownerName = ownerName;
+        _publicIpCidr = publicIpCidr;
+        _publicNextHop = publicNextHop;
+        _internalIpCidr = internalIpCidr;
+    }
+
     @Override
     public boolean executeInSequence() {
         return false;
     }
 
-	public String getGatewayServiceUuid() {
-		return _gatewayServiceUuid;
-	}
-
-	public void setGatewayServiceUuid(String gatewayServiceUuid) {
-		this._gatewayServiceUuid = gatewayServiceUuid;
-	}
-	
-	public String getLogicalSwitchUuid() {
-		return _logicalSwitchUuid;
-	}
-	
-	public void setLogicalSwitchUuid(String logicalSwitchUuid) {
-		_logicalSwitchUuid = logicalSwitchUuid;
-	}
-
-	public long getVlanId() {
-		return _vlanId;
-	}
-
-	public void setVlanId(long vlanId) {
-		this._vlanId = vlanId;
-	}
-
-	public String getName() {
-		return _name;
-	}
-
-	public void setName(String name) {
-		this._name = name;
-	}
-
-	public String getOwnerName() {
-		return _ownerName;
-	}
-
-	public void setOwnerName(String ownerName) {
-		this._ownerName = ownerName;
-	}
-
-	public String getPublicIpCidr() {
-		return _publicIpCidr;
-	}
-
-	public void setPublicIpCidr(String publicIpCidr) {
-		this._publicIpCidr = publicIpCidr;
-	}
-
-	public String getInternalIpCidr() {
-		return _internalIpCidr;
-	}
-
-	public void setInternalIpCidr(String internalIpCidr) {
-		this._internalIpCidr = internalIpCidr;
-	}
-	
-	public String getPublicNextHop() {
-		return _publicNextHop;
-	}
-	
-	public void setPublicNextHop(String publicNextHop) {
-		this._publicNextHop = publicNextHop;
-	}
+    public String getGatewayServiceUuid() {
+        return _gatewayServiceUuid;
+    }
+
+    public void setGatewayServiceUuid(String gatewayServiceUuid) {
+        _gatewayServiceUuid = gatewayServiceUuid;
+    }
+
+    public String getLogicalSwitchUuid() {
+        return _logicalSwitchUuid;
+    }
+
+    public void setLogicalSwitchUuid(String logicalSwitchUuid) {
+        _logicalSwitchUuid = logicalSwitchUuid;
+    }
+
+    public long getVlanId() {
+        return _vlanId;
+    }
+
+    public void setVlanId(long vlanId) {
+        _vlanId = vlanId;
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public String getOwnerName() {
+        return _ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        _ownerName = ownerName;
+    }
+
+    public String getPublicIpCidr() {
+        return _publicIpCidr;
+    }
+
+    public void setPublicIpCidr(String publicIpCidr) {
+        _publicIpCidr = publicIpCidr;
+    }
+
+    public String getInternalIpCidr() {
+        return _internalIpCidr;
+    }
+
+    public void setInternalIpCidr(String internalIpCidr) {
+        _internalIpCidr = internalIpCidr;
+    }
+
+    public String getPublicNextHop() {
+        return _publicNextHop;
+    }
+
+    public void setPublicNextHop(String publicNextHop) {
+        _publicNextHop = publicNextHop;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java
index d8c864d..753edec 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java
@@ -22,9 +22,9 @@ public class CreateLogicalSwitchAnswer extends Answer {
     public CreateLogicalSwitchAnswer(Command command, boolean success,
             String details, String logicalSwitchUuid) {
         super(command, success, details);
-        this._logicalSwitchUuid = logicalSwitchUuid;
+        _logicalSwitchUuid = logicalSwitchUuid;
     }
-    
+
     public CreateLogicalSwitchAnswer(Command command, Exception e) {
         super(command, e);
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java
index 83b03bc..b2a5aaf 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java
@@ -17,17 +17,17 @@
 package com.cloud.agent.api;
 
 public class CreateLogicalSwitchCommand extends Command {
-    
+
     private String _transportUuid;
     private String _transportType;
     private String _name;
     private String _ownerName;
 
     public CreateLogicalSwitchCommand(String transportUuid, String transportType, String name, String ownerName) {
-        this._transportUuid = transportUuid;
-        this._transportType = transportType;
-        this._name = name;
-        this._ownerName = ownerName;
+        _transportUuid = transportUuid;
+        _transportType = transportType;
+        _name = name;
+        _ownerName = ownerName;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java
index 6c6ce77..8fa7927 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java
@@ -22,9 +22,9 @@ public class CreateLogicalSwitchPortAnswer extends Answer {
     public CreateLogicalSwitchPortAnswer(Command command, boolean success,
             String details, String localSwitchPortUuid) {
         super(command, success, details);
-        this._logicalSwitchPortUuid = localSwitchPortUuid;
+        _logicalSwitchPortUuid = localSwitchPortUuid;
     }
-    
+
     public String getLogicalSwitchPortUuid() {
         return _logicalSwitchPortUuid;
     }
@@ -32,5 +32,5 @@ public class CreateLogicalSwitchPortAnswer extends Answer {
     public CreateLogicalSwitchPortAnswer(Command command, Exception e) {
         super(command, e);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java
index 5a28432..fe3f683 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java
@@ -21,15 +21,15 @@ public class CreateLogicalSwitchPortCommand extends Command {
     private String _attachmentUuid;
     private String _ownerName;
     private String _nicName;
-    
+
     public CreateLogicalSwitchPortCommand(String logicalSwitchUuid, String attachmentUuid, String ownerName, String nicName) {
-        this._logicalSwitchUuid = logicalSwitchUuid;
-        this._attachmentUuid = attachmentUuid;
-        this._ownerName = ownerName;
-        this._nicName = nicName;
+        _logicalSwitchUuid = logicalSwitchUuid;
+        _attachmentUuid = attachmentUuid;
+        _ownerName = ownerName;
+        _nicName = nicName;
     }
-    
-    
+
+
     public String getLogicalSwitchUuid() {
         return _logicalSwitchUuid;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java
index 8a6bb9f..db07547 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,10 +17,10 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class DeleteLogicalRouterAnswer extends Answer {
-	
+
     public DeleteLogicalRouterAnswer(Command command, boolean success,
             String details) {
         super(command, success, details);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java
index 4799f9e..96e2cb9 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,25 +17,26 @@
 package com.cloud.agent.api;
 
 /**
- * 
+ *
  */
 public class DeleteLogicalRouterCommand extends Command {
-	
-	private String _logicalRouterUuid;
-	
-	public DeleteLogicalRouterCommand(String logicalRouterUuid) {
-		this._logicalRouterUuid = logicalRouterUuid;
-	}
 
-	/* (non-Javadoc)
-	 * @see com.cloud.agent.api.Command#executeInSequence()
-	 */
-	@Override
-	public boolean executeInSequence() {
-		return false;
-	}
+    private String _logicalRouterUuid;
+
+    public DeleteLogicalRouterCommand(String logicalRouterUuid) {
+        _logicalRouterUuid = logicalRouterUuid;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.cloud.agent.api.Command#executeInSequence()
+     */
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
 
-	public String getLogicalRouterUuid() {
-		return _logicalRouterUuid;
-	}
+    public String getLogicalRouterUuid() {
+        return _logicalRouterUuid;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java
index ce6b82b..25aa339 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java
@@ -17,11 +17,11 @@
 package com.cloud.agent.api;
 
 public class DeleteLogicalSwitchCommand extends Command {
-    
+
     private String _logicalSwitchUuid;
-    
+
     public DeleteLogicalSwitchCommand(String logicalSwitchUuid) {
-        this._logicalSwitchUuid = logicalSwitchUuid;
+        _logicalSwitchUuid = logicalSwitchUuid;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java
index aad6eea..e91a032 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java
@@ -19,16 +19,16 @@ package com.cloud.agent.api;
 public class DeleteLogicalSwitchPortCommand extends Command {
     private String _logicalSwitchUuid;
     private String _logicalSwithPortUuid;
-    
+
     public DeleteLogicalSwitchPortCommand(String logicalSwitchUuid, String logicalSwitchPortUuid) {
-        this._logicalSwitchUuid = logicalSwitchUuid;
-        this._logicalSwithPortUuid = logicalSwitchPortUuid;
+        _logicalSwitchUuid = logicalSwitchUuid;
+        _logicalSwithPortUuid = logicalSwitchPortUuid;
     }
-    
+
     public String getLogicalSwitchUuid() {
         return _logicalSwitchUuid;
     }
-    
+
     public String getLogicalSwitchPortUuid() {
         return _logicalSwithPortUuid;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java
index f54bd85..edc0c5f 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java
@@ -22,9 +22,9 @@ public class FindLogicalSwitchPortAnswer extends Answer {
     public FindLogicalSwitchPortAnswer(Command command, boolean success,
             String details, String localSwitchPortUuid) {
         super(command, success, details);
-        this._logicalSwitchPortUuid = localSwitchPortUuid;
+        _logicalSwitchPortUuid = localSwitchPortUuid;
     }
-    
+
     public String getLogicalSwitchPortUuid() {
         return _logicalSwitchPortUuid;
     }
@@ -32,5 +32,5 @@ public class FindLogicalSwitchPortAnswer extends Answer {
     public FindLogicalSwitchPortAnswer(Command command, Exception e) {
         super(command, e);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java
index cccce67..b737c50 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java
@@ -17,25 +17,25 @@
 package com.cloud.agent.api;
 
 public class FindLogicalSwitchPortCommand extends Command {
-	private String _logicalSwitchUuid;
+    private String _logicalSwitchUuid;
     private String _logicalSwitchPortUuid;
-    
+
     public FindLogicalSwitchPortCommand(String logicalSwitchUuid, String logicalSwitchPortUuid) {
-    	this._logicalSwitchUuid = logicalSwitchUuid;
-        this._logicalSwitchPortUuid = logicalSwitchPortUuid;
+        _logicalSwitchUuid = logicalSwitchUuid;
+        _logicalSwitchPortUuid = logicalSwitchPortUuid;
     }
-    
-    
+
+
     public String getLogicalSwitchUuid() {
         return _logicalSwitchUuid;
     }
 
-    
+
     public String getLogicalSwitchPortUuid() {
         return _logicalSwitchPortUuid;
     }
 
-    
+
     @Override
     public boolean executeInSequence() {
         return false;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java
index 3b7fbf7..f4c4130 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java
@@ -22,9 +22,9 @@ public class UpdateLogicalSwitchPortAnswer extends Answer {
     public UpdateLogicalSwitchPortAnswer(Command command, boolean success,
             String details, String localSwitchPortUuid) {
         super(command, success, details);
-        this._logicalSwitchPortUuid = localSwitchPortUuid;
+        _logicalSwitchPortUuid = localSwitchPortUuid;
     }
-    
+
     public String getLogicalSwitchPortUuid() {
         return _logicalSwitchPortUuid;
     }
@@ -32,5 +32,5 @@ public class UpdateLogicalSwitchPortAnswer extends Answer {
     public UpdateLogicalSwitchPortAnswer(Command command, Exception e) {
         super(command, e);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java
index 83ae231..1b8b590 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java
@@ -22,16 +22,16 @@ public class UpdateLogicalSwitchPortCommand extends Command {
     private String _attachmentUuid;
     private String _ownerName;
     private String _nicName;
-    
+
     public UpdateLogicalSwitchPortCommand(String logicalSwitchPortUuid, String logicalSwitchUuid, String attachmentUuid, String ownerName, String nicName) {
-        this._logicalSwitchUuid = logicalSwitchUuid;
-        this._logicalSwitchPortUuid = logicalSwitchPortUuid;
-        this._attachmentUuid = attachmentUuid;
-        this._ownerName = ownerName;
-        this._nicName = nicName;
+        _logicalSwitchUuid = logicalSwitchUuid;
+        _logicalSwitchPortUuid = logicalSwitchPortUuid;
+        _attachmentUuid = attachmentUuid;
+        _ownerName = ownerName;
+        _nicName = nicName;
     }
-    
-    
+
+
     public String getLogicalSwitchUuid() {
         return _logicalSwitchUuid;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
index 7f0d87c..937b665 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
@@ -18,12 +18,15 @@ package com.cloud.api.commands;
 
 import javax.inject.Inject;
 
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
-
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
 import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.api.response.NiciraNvpDeviceResponse;
@@ -42,7 +45,7 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
     private static final Logger s_logger = Logger.getLogger(AddNiciraNvpDeviceCmd.class.getName());
     private static final String s_name = "addniciranvpdeviceresponse";
     @Inject NiciraNvpElementService _niciraNvpElementService;
-    
+
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -56,16 +59,16 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
 
     @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required = true, description="Credentials to access the Nicira Controller API")
     private String username;
-    
+
     @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required = true, description="Credentials to access the Nicira Controller API")
     private String password;
-    
+
     @Parameter(name=ApiConstants.NICIRA_NVP_TRANSPORT_ZONE_UUID, type=CommandType.STRING, required = true, description="The Transportzone UUID configured on the Nicira Controller")
     private String transportzoneuuid;
-    
+
     @Parameter(name=ApiConstants.NICIRA_NVP_GATEWAYSERVICE_UUID, type=CommandType.STRING, required = false, description="The L3 Gateway Service UUID configured on the Nicira Controller")
     private String l3gatewayserviceuuid;
-    
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -85,13 +88,13 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
     public String getPassword() {
         return password;
     }
-    
+
     public String getTransportzoneUuid() {
         return transportzoneuuid;
     }
-    
+
     public String getL3GatewayServiceUuid() {
-    	return l3gatewayserviceuuid;
+        return l3gatewayserviceuuid;
     }
 
     /////////////////////////////////////////////////////
@@ -106,7 +109,7 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
                 NiciraNvpDeviceResponse response = _niciraNvpElementService.createNiciraNvpDeviceResponse(niciraNvpDeviceVO);
                 response.setObjectName("niciranvpdevice");
                 response.setResponseName(getCommandName());
-                this.setResponseObject(response);
+                setResponseObject(response);
             } else {
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Nicira NVP device due to internal error.");
             }
@@ -116,7 +119,7 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage());
         }
     }
- 
+
     @Override
     public String getCommandName() {
         return s_name;
@@ -127,13 +130,13 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
         return CallContext.current().getCallingAccount().getId();
     }
 
-	@Override
-	public String getEventType() {
-		return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_ADD;
-	}
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_ADD;
+    }
 
-	@Override
-	public String getEventDescription() {
-		return "Adding a Nicira Nvp Controller";
-	}
+    @Override
+    public String getEventDescription() {
+        return "Adding a Nicira Nvp Controller";
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
index 948f1bf..6eb6764 100755
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
@@ -18,20 +18,18 @@ package com.cloud.api.commands;
 
 import javax.inject.Inject;
 
-import com.cloud.api.response.NiciraNvpDeviceResponse;
-
 import org.apache.log4j.Logger;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
 
+import com.cloud.api.response.NiciraNvpDeviceResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -74,7 +72,7 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd {
             if (result) {
                 SuccessResponse response = new SuccessResponse(getCommandName());
                 response.setResponseName(getCommandName());
-                this.setResponseObject(response);
+                setResponseObject(response);
             } else {
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Nicira device.");
             }
@@ -95,14 +93,14 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd {
         return CallContext.current().getCallingAccount().getId();
     }
 
-	@Override
-	public String getEventType() {
-		return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_DELETE;
-	}
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_DELETE;
+    }
 
-	@Override
-	public String getEventDescription() {
-		return "Deleting Nicira Nvp Controller";
-	}
+    @Override
+    public String getEventDescription() {
+        return "Deleting Nicira Nvp Controller";
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
index e224cea..53203a7 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
@@ -21,18 +21,18 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import com.cloud.api.response.NiciraNvpDeviceResponse;
 import org.apache.log4j.Logger;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.NetworkResponse;
+
+import com.cloud.api.response.NiciraNvpDeviceResponse;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
@@ -85,7 +85,7 @@ public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd {
 
             response.setResponses(networkResponses);
             response.setResponseName(getCommandName());
-            this.setResponseObject(response);
+            setResponseObject(response);
         }  catch (InvalidParameterValueException invalidParamExcp) {
             throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage());
         } catch (CloudRuntimeException runtimeExcp) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
index 81cbb23..3e02e19 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
@@ -21,17 +21,17 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
-import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.api.response.NiciraNvpDeviceResponse;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -48,7 +48,7 @@ public class ListNiciraNvpDevicesCmd extends BaseListCmd {
     private static final String s_name = "listniciranvpdeviceresponse";
     @Inject NiciraNvpElementService _niciraNvpElementService;
 
-   /////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
@@ -92,7 +92,7 @@ public class ListNiciraNvpDevicesCmd extends BaseListCmd {
 
             response.setResponses(niciraDevicesResponse);
             response.setResponseName(getCommandName());
-            this.setResponseObject(response);
+            setResponseObject(response);
         }  catch (InvalidParameterValueException invalidParamExcp) {
             throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage());
         } catch (CloudRuntimeException runtimeExcp) {
@@ -104,5 +104,5 @@ public class ListNiciraNvpDevicesCmd extends BaseListCmd {
     public String getCommandName() {
         return s_name;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java
index 097ecd9..d6085e2 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java
@@ -16,13 +16,15 @@
 // under the License.
 package com.cloud.api.response;
 
-import com.cloud.network.NiciraNvpDeviceVO;
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
+
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
+import com.cloud.network.NiciraNvpDeviceVO;
+import com.cloud.serializer.Param;
+
 @EntityReference(value=NiciraNvpDeviceVO.class)
 public class NiciraNvpDeviceResponse extends BaseResponse {
     @SerializedName(ApiConstants.NICIRA_NVP_DEVICE_ID) @Param(description="device id of the Nicire Nvp")
@@ -47,7 +49,7 @@ public class NiciraNvpDeviceResponse extends BaseResponse {
     private String l3GatewayServiceUuid;
 
     public void setId(String nvpDeviceId) {
-        this.id = nvpDeviceId;
+        id = nvpDeviceId;
     }
 
     public void setPhysicalNetworkId(String physicalNetworkId) {
@@ -62,18 +64,16 @@ public class NiciraNvpDeviceResponse extends BaseResponse {
         this.deviceName = deviceName;
     }
 
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
 
+    public void setTransportZoneUuid(String transportZoneUuid) {
+        this.transportZoneUuid = transportZoneUuid;
+    }
 
-	public void setHostName(String hostName) {
-		this.hostName = hostName;
-	}
-
-	public void setTransportZoneUuid(String transportZoneUuid) {
-		this.transportZoneUuid = transportZoneUuid;
-	}
-
-	public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
-		this.l3GatewayServiceUuid = l3GatewayServiceUuid;
-	}
+    public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
+        this.l3GatewayServiceUuid = l3GatewayServiceUuid;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpDeviceVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpDeviceVO.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpDeviceVO.java
index a1097b9..3832123 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpDeviceVO.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpDeviceVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.network;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import java.util.UUID;
 
 import javax.persistence.Column;
@@ -27,6 +25,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 @Entity
 @Table(name="external_nicira_nvp_devices")
 public class NiciraNvpDeviceVO implements InternalIdentity {
@@ -35,25 +35,25 @@ public class NiciraNvpDeviceVO implements InternalIdentity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name="id")
     private long id;
-    
+
     @Column(name="uuid")
     private String uuid;
-    
+
     @Column(name="host_id")
     private long hostId;
-    
+
     @Column(name="physical_network_id")
     private long physicalNetworkId;
-    
+
     @Column(name="provider_name")
     private String providerName;
-    
+
     @Column(name="device_name")
     private String deviceName;
 
-    
+
     public NiciraNvpDeviceVO() {
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
     public NiciraNvpDeviceVO(long hostId, long physicalNetworkId,
@@ -63,13 +63,14 @@ public class NiciraNvpDeviceVO implements InternalIdentity {
         this.physicalNetworkId = physicalNetworkId;
         this.providerName = providerName;
         this.deviceName = deviceName;
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
+    @Override
     public long getId() {
         return id;
     }
-    
+
     public String getUuid() {
         return uuid;
     }
@@ -93,5 +94,5 @@ public class NiciraNvpDeviceVO implements InternalIdentity {
     public String getDeviceName() {
         return deviceName;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java
index 4c948cc..d9dbb02 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpNicMappingVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.network;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 @Entity
 @Table(name="nicira_nvp_nic_map")
 public class NiciraNvpNicMappingVO implements InternalIdentity {
@@ -36,16 +36,16 @@ public class NiciraNvpNicMappingVO implements InternalIdentity {
 
     @Column(name="logicalswitch")
     private String logicalSwitchUuid;
-    
+
     @Column(name="logicalswitchport")
     private String logicalSwitchPortUuid;
-    
+
     @Column(name="nic")
     private String nicUuid;
-    
-    public NiciraNvpNicMappingVO () {    
+
+    public NiciraNvpNicMappingVO () {
     }
-    
+
     public NiciraNvpNicMappingVO (String logicalSwitchUuid, String logicalSwitchPortUuid, String nicUuid) {
         this.logicalSwitchUuid = logicalSwitchUuid;
         this.logicalSwitchPortUuid = logicalSwitchPortUuid;
@@ -76,8 +76,9 @@ public class NiciraNvpNicMappingVO implements InternalIdentity {
         this.nicUuid = nicUuid;
     }
 
+    @Override
     public long getId() {
         return id;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java
index ced880f..1e2a831 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/NiciraNvpRouterMappingVO.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.network;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,57 +23,59 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 @Entity
 @Table(name="nicira_nvp_router_map")
 public class NiciraNvpRouterMappingVO implements InternalIdentity {
-	//FIXME the ddl for this table should be in one of the upgrade scripts
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id")
-	private long id;
-	
-	@Column(name="logicalrouter_uuid")
-	private String logicalRouterUuid;
-	
-	@Column(name="network_id")
-	private long networkId;
-	
-	public NiciraNvpRouterMappingVO() {
-	}
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id")
+    private long id;
+
+    @Column(name="logicalrouter_uuid")
+    private String logicalRouterUuid;
+
+    @Column(name="network_id")
+    private long networkId;
+
+    public NiciraNvpRouterMappingVO() {
+    }
+
+    public NiciraNvpRouterMappingVO(String logicalRouterUuid, long networkId) {
+        this.logicalRouterUuid = logicalRouterUuid;
+        this.networkId = networkId;
+    }
+
+    public NiciraNvpRouterMappingVO(long id, String logicalRouterUuid, long networkId) {
+        this.id = id;
+        this.logicalRouterUuid = logicalRouterUuid;
+        this.networkId = networkId;
+    }
 
-	public NiciraNvpRouterMappingVO(String logicalRouterUuid, long networkId) {
-		this.logicalRouterUuid = logicalRouterUuid;
-		this.networkId = networkId;
-	}
-	
-	public NiciraNvpRouterMappingVO(long id, String logicalRouterUuid, long networkId) {
-		this.id = id;
-		this.logicalRouterUuid = logicalRouterUuid;
-		this.networkId = networkId;
-	}
+    @Override
+    public long getId() {
+        return id;
+    }
 
-	public long getId() {
-		return id;
-	}
+    public void setId(long id) {
+        this.id = id;
+    }
 
-	public void setId(long id) {
-		this.id = id;
-	}
+    public String getLogicalRouterUuid() {
+        return logicalRouterUuid;
+    }
 
-	public String getLogicalRouterUuid() {
-		return logicalRouterUuid;
-	}
+    public void setLogicalRouterUuid(String logicalRouterUuid) {
+        this.logicalRouterUuid = logicalRouterUuid;
+    }
 
-	public void setLogicalRouterUuid(String logicalRouterUuid) {
-		this.logicalRouterUuid = logicalRouterUuid;
-	}
+    public long getNetworkId() {
+        return networkId;
+    }
 
-	public long getNetworkId() {
-		return networkId;
-	}
+    public void setNetworkId(long networkId) {
+        this.networkId = networkId;
+    }
 
-	public void setNetworkId(long networkId) {
-		this.networkId = networkId;
-	}
-	
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java
index 62662c5..5e07246 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java
@@ -31,10 +31,10 @@ import com.cloud.utils.db.SearchCriteria.Op;
 @Component
 @Local(value=NiciraNvpDao.class)
 public class NiciraNvpDaoImpl extends GenericDaoBase<NiciraNvpDeviceVO, Long>
-        implements NiciraNvpDao {
-    
+implements NiciraNvpDao {
+
     protected final SearchBuilder<NiciraNvpDeviceVO> physicalNetworkIdSearch;
-    
+
     public NiciraNvpDaoImpl() {
         physicalNetworkIdSearch = createSearchBuilder();
         physicalNetworkIdSearch.and("physicalNetworkId", physicalNetworkIdSearch.entity().getPhysicalNetworkId(), Op.EQ);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDao.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDao.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDao.java
index b463fe8..f693dcb 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDao.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDao.java
@@ -21,9 +21,12 @@ import com.cloud.utils.db.GenericDao;
 
 public interface NiciraNvpNicMappingDao extends GenericDao<NiciraNvpNicMappingVO, Long> {
 
-    /** find the mapping for a nic 
-     * @param nicUuid the Uuid of a nic attached to a logical switch port
-     * @return NiciraNvpNicMapping for this nic uuid or null if it does not exist
+    /**
+     * find the mapping for a nic
+     * @param nicUuid
+     *            the Uuid of a nic attached to a logical switch port
+     * @return NiciraNvpNicMapping for this nic uuid or null if it does not
+     *         exist
      */
     public NiciraNvpNicMappingVO findByNicUuid(String nicUuid);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java
index b40aad4..1a0fcd1 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java
@@ -29,16 +29,16 @@ import com.cloud.utils.db.SearchCriteria.Op;
 @Component
 @Local(value=NiciraNvpNicMappingDao.class)
 public class NiciraNvpNicMappingDaoImpl extends
-        GenericDaoBase<NiciraNvpNicMappingVO, Long> implements NiciraNvpNicMappingDao {
+GenericDaoBase<NiciraNvpNicMappingVO, Long> implements NiciraNvpNicMappingDao {
 
     protected final SearchBuilder<NiciraNvpNicMappingVO> nicSearch;
-    
+
     public NiciraNvpNicMappingDaoImpl() {
         nicSearch = createSearchBuilder();
         nicSearch.and("nicUuid", nicSearch.entity().getNicUuid(), Op.EQ);
         nicSearch.done();
     }
-    
+
     @Override
     public NiciraNvpNicMappingVO findByNicUuid(String nicUuid) {
         SearchCriteria<NiciraNvpNicMappingVO> sc = nicSearch.create();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDao.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDao.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDao.java
index c6c58c8..e822ebd 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDao.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDao.java
@@ -21,5 +21,5 @@ import com.cloud.utils.db.GenericDao;
 
 public interface NiciraNvpRouterMappingDao extends GenericDao<NiciraNvpRouterMappingVO, Long> {
 
-	public NiciraNvpRouterMappingVO findByNetworkId(long id);
+    public NiciraNvpRouterMappingVO findByNetworkId(long id);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java
index d3192ec..dc41f57 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java
@@ -30,20 +30,19 @@ import com.cloud.utils.db.SearchCriteria.Op;
 @Local(value=NiciraNvpRouterMappingDao.class)
 public class NiciraNvpRouterMappingDaoImpl extends GenericDaoBase<NiciraNvpRouterMappingVO, Long> implements NiciraNvpRouterMappingDao {
 
-	protected final SearchBuilder<NiciraNvpRouterMappingVO> networkSearch;
-	
-	public NiciraNvpRouterMappingDaoImpl() {
-		networkSearch = createSearchBuilder();
-		networkSearch.and("network_id", networkSearch.entity().getNetworkId(), Op.EQ);
-		networkSearch.done();
-	}
-	
-	@Override
-	public NiciraNvpRouterMappingVO findByNetworkId(long id) {
-		SearchCriteria<NiciraNvpRouterMappingVO> sc = networkSearch.create();
-		sc.setParameters("network_id", id);
-		return findOneBy(sc);
-	}
-	
+    protected final SearchBuilder<NiciraNvpRouterMappingVO> networkSearch;
+
+    public NiciraNvpRouterMappingDaoImpl() {
+        networkSearch = createSearchBuilder();
+        networkSearch.and("network_id", networkSearch.entity().getNetworkId(), Op.EQ);
+        networkSearch.done();
+    }
+
+    @Override
+    public NiciraNvpRouterMappingVO findByNetworkId(long id) {
+        SearchCriteria<NiciraNvpRouterMappingVO> sc = networkSearch.create();
+        sc.setParameters("network_id", id);
+        return findOneBy(sc);
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index ef8ec86..3e9e16a 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -30,6 +30,7 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
+
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 
@@ -128,9 +129,9 @@ import com.cloud.vm.dao.NicDao;
         SourceNatServiceProvider.class, StaticNatServiceProvider.class,
         PortForwardingServiceProvider.class, IpDeployer.class} )
 public class NiciraNvpElement extends AdapterBase implements
-        ConnectivityProvider, SourceNatServiceProvider,
-        PortForwardingServiceProvider, StaticNatServiceProvider,
-        NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
+ConnectivityProvider, SourceNatServiceProvider,
+PortForwardingServiceProvider, StaticNatServiceProvider,
+NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
     private static final Logger s_logger = Logger
             .getLogger(NiciraNvpElement.class);
 
@@ -217,8 +218,8 @@ public class NiciraNvpElement extends AdapterBase implements
     @Override
     public boolean implement(Network network, NetworkOffering offering,
             DeployDestination dest, ReservationContext context)
-            throws ConcurrentOperationException, ResourceUnavailableException,
-            InsufficientCapacityException {
+                    throws ConcurrentOperationException, ResourceUnavailableException,
+                    InsufficientCapacityException {
         s_logger.debug("entering NiciraNvpElement implement function for network "
                 + network.getDisplayText()
                 + " (state "
@@ -247,17 +248,6 @@ public class NiciraNvpElement extends AdapterBase implements
 
         Account owner = context.getAccount();
 
-        /**
-         * Lock the network as we might need to do multiple operations that
-         * should be done only once.
-         */
-//		Network lock = _networkDao.acquireInLockTable(network.getId(),
-//				_networkModel.getNetworkLockTimeout());
-//		if (lock == null) {
-//			throw new ConcurrentOperationException("Unable to lock network "
-//					+ network.getId());
-//		}
-
         // Implement SourceNat immediately as we have al the info already
         if (_networkModel.isProviderSupportServiceInNetwork(
                 network.getId(), Service.SourceNat, Provider.NiciraNvp)) {
@@ -277,9 +267,9 @@ public class NiciraNvpElement extends AdapterBase implements
                     BroadcastDomainType.getValue(network.getBroadcastUri()),
                     "router-" + network.getDisplayText(), publicCidr,
                     sourceNatIp.getGateway(), internalCidr, context
-                            .getDomain().getName()
-                            + "-"
-                            + context.getAccount().getAccountName());
+                    .getDomain().getName()
+                    + "-"
+                    + context.getAccount().getAccountName());
             CreateLogicalRouterAnswer answer = (CreateLogicalRouterAnswer)_agentMgr
                     .easySend(niciraNvpHost.getId(), cmd);
             if (answer.getResult() == false) {
@@ -343,7 +333,7 @@ public class NiciraNvpElement extends AdapterBase implements
                         BroadcastDomainType.getValue(network.getBroadcastUri()),
                         nicVO.getUuid(), context.getDomain().getName() + "-"
                                 + context.getAccount().getAccountName(),
-                        nic.getName());
+                                nic.getName());
                 _agentMgr.easySend(niciraNvpHost.getId(), cmd);
                 return true;
             } else {
@@ -489,7 +479,7 @@ public class NiciraNvpElement extends AdapterBase implements
     @Override
     public boolean shutdownProviderInstances(
             PhysicalNetworkServiceProvider provider, ReservationContext context)
-            throws ConcurrentOperationException, ResourceUnavailableException {
+                    throws ConcurrentOperationException, ResourceUnavailableException {
         // Nothing to do here.
         return true;
     }
@@ -618,7 +608,7 @@ public class NiciraNvpElement extends AdapterBase implements
                                 physicalNetworkId, ntwkSvcProvider.getProviderName(),
                                 deviceName);
                         _niciraNvpDao.persist(niciraNvpDevice);
-        
+
                         DetailVO detail = new DetailVO(host.getId(),
                                 "niciranvpdeviceid", String.valueOf(niciraNvpDevice
                                         .getId()));
@@ -818,7 +808,7 @@ public class NiciraNvpElement extends AdapterBase implements
     @Override
     public boolean applyIps(Network network,
             List<? extends PublicIpAddress> ipAddress, Set<Service> services)
-            throws ResourceUnavailableException {
+                    throws ResourceUnavailableException {
         if (services.contains(Service.SourceNat)) {
             // Only if we need to provide SourceNat we need to configure the logical router
             // SourceNat is required for StaticNat and PortForwarding
@@ -869,7 +859,7 @@ public class NiciraNvpElement extends AdapterBase implements
     @Override
     public boolean applyStaticNats(Network network,
             List<? extends StaticNat> rules)
-            throws ResourceUnavailableException {
+                    throws ResourceUnavailableException {
         if (!canHandle(network, Service.StaticNat)) {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
index 51c59bf..7057915 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
@@ -62,7 +62,6 @@ import com.cloud.user.Account;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 
 @Local(value = NetworkGuru.class)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/ControlClusterStatus.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/ControlClusterStatus.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/ControlClusterStatus.java
index 10890d5..2914d35 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/ControlClusterStatus.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/ControlClusterStatus.java
@@ -17,66 +17,68 @@
 package com.cloud.network.nicira;
 
 public class ControlClusterStatus {
-	private String cluster_status;
-	private Stats node_stats;
-	private Stats lqueue_stats;
-	private Stats lport_stats;
-	private Stats lrouterport_stats;
-	private Stats lswitch_stats;
-	private Stats zone_stats;
-	private Stats lrouter_stats;
-	private Stats security_profile_stats;
-	
-	public String getClusterStatus() {
-		return cluster_status;
-	}
+    private String cluster_status;
+    private Stats node_stats;
+    private Stats lqueue_stats;
+    private Stats lport_stats;
+    private Stats lrouterport_stats;
+    private Stats lswitch_stats;
+    private Stats zone_stats;
+    private Stats lrouter_stats;
+    private Stats security_profile_stats;
 
-	public Stats getNodeStats() {
-		return node_stats;
-	}
+    public String getClusterStatus() {
+        return cluster_status;
+    }
 
-	public Stats getLqueueStats() {
-		return lqueue_stats;
-	}
+    public Stats getNodeStats() {
+        return node_stats;
+    }
 
-	public Stats getLportStats() {
-		return lport_stats;
-	}
+    public Stats getLqueueStats() {
+        return lqueue_stats;
+    }
 
-	public Stats getLrouterportStats() {
-		return lrouterport_stats;
-	}
+    public Stats getLportStats() {
+        return lport_stats;
+    }
 
-	public Stats getLswitchStats() {
-		return lswitch_stats;
-	}
+    public Stats getLrouterportStats() {
+        return lrouterport_stats;
+    }
 
-	public Stats getZoneStats() {
-		return zone_stats;
-	}
+    public Stats getLswitchStats() {
+        return lswitch_stats;
+    }
 
-	public Stats getLrouterStats() {
-		return lrouter_stats;
-	}
+    public Stats getZoneStats() {
+        return zone_stats;
+    }
 
-	public Stats getSecurityProfileStats() {
-		return security_profile_stats;
-	}
+    public Stats getLrouterStats() {
+        return lrouter_stats;
+    }
 
-	public class Stats {
-		private int error_state_count;
-		private int registered_count;
-		private int active_count;
-		
-		public int getErrorStateCount() {
-			return error_state_count;
-		}
-		public int getRegisteredCount() {
-			return registered_count;
-		}
-		public int getActiveCount() {
-			return active_count;
-		}
-		
-	}
+    public Stats getSecurityProfileStats() {
+        return security_profile_stats;
+    }
+
+    public class Stats {
+        private int error_state_count;
+        private int registered_count;
+        private int active_count;
+
+        public int getErrorStateCount() {
+            return error_state_count;
+        }
+
+        public int getRegisteredCount() {
+            return registered_count;
+        }
+
+        public int getActiveCount() {
+            return active_count;
+        }
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/DestinationNatRule.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/DestinationNatRule.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/DestinationNatRule.java
index 20afea9..d149c4b 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/DestinationNatRule.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/DestinationNatRule.java
@@ -19,7 +19,7 @@ package com.cloud.network.nicira;
 public class DestinationNatRule extends NatRule {
     private String toDestinationIpAddress;
     private Integer toDestinationPort;
-    
+
     public DestinationNatRule() {
         setType("DestinationNatRule");
     }
@@ -28,17 +28,14 @@ public class DestinationNatRule extends NatRule {
         return toDestinationIpAddress;
     }
 
-
     public void setToDestinationIpAddress(String toDestinationIpAddress) {
         this.toDestinationIpAddress = toDestinationIpAddress;
     }
 
-
     public Integer getToDestinationPort() {
         return toDestinationPort;
     }
 
-
     public void setToDestinationPort(Integer toDestinationPort) {
         this.toDestinationPort = toDestinationPort;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/256763cf/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/L3GatewayAttachment.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/L3GatewayAttachment.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/L3GatewayAttachment.java
index 8b807fd..96d1991 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/L3GatewayAttachment.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/L3GatewayAttachment.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -17,36 +17,36 @@
 package com.cloud.network.nicira;
 
 /**
- * 
+ *
  */
 public class L3GatewayAttachment extends Attachment {
-	private String l3_gateway_service_uuid;
-	private String type = "L3GatewayAttachment";
-	private Long vlan_id;
-	
-	public L3GatewayAttachment(String l3_gateway_service_uuid) {
-		this.l3_gateway_service_uuid = l3_gateway_service_uuid;
-	}
-	
-	public L3GatewayAttachment(String l3_gateway_service_uuid, long vlan_id) {
-		this.l3_gateway_service_uuid = l3_gateway_service_uuid;
-		this.vlan_id = vlan_id;
-	}
-	
-	public String getL3GatewayServiceUuid() {
-		return l3_gateway_service_uuid;
-	}
-	
-	public void setL3GatewayServiceUuid(String l3_gateway_service_uuid) {
-		this.l3_gateway_service_uuid = l3_gateway_service_uuid;
-	}
-	
-	public long getVlanId() {
-		return vlan_id;
-	}
-	
-	public void setVlanId(long vlan_id) {
-		this.vlan_id = vlan_id;
-	}
+    private String l3_gateway_service_uuid;
+    private String type = "L3GatewayAttachment";
+    private Long vlan_id;
+
+    public L3GatewayAttachment(String l3_gateway_service_uuid) {
+        this.l3_gateway_service_uuid = l3_gateway_service_uuid;
+    }
+
+    public L3GatewayAttachment(String l3_gateway_service_uuid, long vlan_id) {
+        this.l3_gateway_service_uuid = l3_gateway_service_uuid;
+        this.vlan_id = vlan_id;
+    }
+
+    public String getL3GatewayServiceUuid() {
+        return l3_gateway_service_uuid;
+    }
+
+    public void setL3GatewayServiceUuid(String l3_gateway_service_uuid) {
+        this.l3_gateway_service_uuid = l3_gateway_service_uuid;
+    }
+
+    public long getVlanId() {
+        return vlan_id;
+    }
+
+    public void setVlanId(long vlan_id) {
+        this.vlan_id = vlan_id;
+    }
 
 }


Mime
View raw message