You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/11/18 19:24:57 UTC
[6/6] git commit: updated refs/heads/master to 876b7e4
Checkstyle adjustments in code and configuration
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/876b7e49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/876b7e49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/876b7e49
Branch: refs/heads/master
Commit: 876b7e492f15154591ba132ddbfe6a8e7a4c4c3f
Parents: 709b70c
Author: afornie <af...@schubergphilis.com>
Authored: Mon Nov 18 12:12:07 2013 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 18 19:22:42 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/tooling/checkstyle.xml | 24 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
...ortForwardingRulesOnLogicalRouterAnswer.java | 9 +-
...rtForwardingRulesOnLogicalRouterCommand.java | 9 +-
...ConfigurePublicIpsOnLogicalRouterAnswer.java | 6 +-
...onfigurePublicIpsOnLogicalRouterCommand.java | 9 +-
...gureStaticNatRulesOnLogicalRouterAnswer.java | 6 +-
...ureStaticNatRulesOnLogicalRouterCommand.java | 10 +-
.../agent/api/CreateLogicalRouterAnswer.java | 12 +-
.../agent/api/CreateLogicalRouterCommand.java | 90 +++---
.../agent/api/CreateLogicalSwitchAnswer.java | 12 +-
.../agent/api/CreateLogicalSwitchCommand.java | 29 +-
.../api/CreateLogicalSwitchPortAnswer.java | 12 +-
.../api/CreateLogicalSwitchPortCommand.java | 29 +-
.../agent/api/DeleteLogicalRouterAnswer.java | 6 +-
.../agent/api/DeleteLogicalRouterCommand.java | 9 +-
.../agent/api/DeleteLogicalSwitchAnswer.java | 6 +-
.../agent/api/DeleteLogicalSwitchCommand.java | 8 +-
.../api/DeleteLogicalSwitchPortAnswer.java | 6 +-
.../api/DeleteLogicalSwitchPortCommand.java | 14 +-
.../agent/api/FindLogicalSwitchPortAnswer.java | 12 +-
.../agent/api/FindLogicalSwitchPortCommand.java | 12 +-
.../api/UpdateLogicalSwitchPortAnswer.java | 6 +-
.../api/UpdateLogicalSwitchPortCommand.java | 33 +-
.../api/commands/AddNiciraNvpDeviceCmd.java | 16 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 11 +-
.../ListNiciraNvpDeviceNetworksCmd.java | 10 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 20 +-
.../api/response/NiciraNvpDeviceResponse.java | 22 +-
.../com/cloud/network/NiciraNvpDeviceVO.java | 4 +-
.../cloud/network/NiciraNvpNicMappingVO.java | 6 +-
.../cloud/network/NiciraNvpRouterMappingVO.java | 11 +-
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 4 +-
.../network/dao/NiciraNvpNicMappingDao.java | 9 +-
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 4 +-
.../dao/NiciraNvpRouterMappingDaoImpl.java | 3 +-
.../cloud/network/element/NiciraNvpElement.java | 210 ++++++------
.../network/guru/NiciraNvpGuestNetworkGuru.java | 75 +++--
.../network/nicira/ControlClusterStatus.java | 50 ++-
.../network/nicira/DestinationNatRule.java | 49 ++-
.../network/nicira/L3GatewayAttachment.java | 28 +-
.../network/nicira/LogicalRouterConfig.java | 19 +-
.../cloud/network/nicira/LogicalRouterPort.java | 34 +-
.../com/cloud/network/nicira/LogicalSwitch.java | 53 ++-
.../cloud/network/nicira/LogicalSwitchPort.java | 59 ++--
.../src/com/cloud/network/nicira/Match.java | 106 +++---
.../src/com/cloud/network/nicira/NatRule.java | 14 +-
.../com/cloud/network/nicira/NiciraNvpApi.java | 298 ++++++++---------
.../network/nicira/NiciraNvpApiException.java | 6 +-
.../com/cloud/network/nicira/NiciraNvpList.java | 12 +-
.../com/cloud/network/nicira/NiciraNvpTag.java | 3 +-
.../cloud/network/nicira/PatchAttachment.java | 9 +-
.../com/cloud/network/nicira/RouterNextHop.java | 13 +-
.../SingleDefaultRouteImplictRoutingConfig.java | 11 +-
.../com/cloud/network/nicira/SourceNatRule.java | 10 +-
.../network/nicira/TransportZoneBinding.java | 26 +-
.../com/cloud/network/nicira/VifAttachment.java | 14 +-
.../network/resource/NiciraNvpResource.java | 182 +++++------
.../network/element/NiciraNvpElementTest.java | 87 +++--
.../guru/NiciraNvpGuestNetworkGuruTest.java | 125 ++++----
.../cloud/network/nicira/NiciraNvpApiTest.java | 210 ++++++------
.../com/cloud/network/nicira/NiciraTagTest.java | 2 +-
.../network/resource/NiciraNvpResourceTest.java | 319 +++++++++----------
63 files changed, 1289 insertions(+), 1226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
index a8e8deb..289ad67 100644
--- a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
+++ b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
@@ -26,14 +26,28 @@
<property name="eachLine" value="true"/>
</module>
+ <module name="TreeWalker">
+ <module name="LineLength">
+ <property name="max" value="180"/>
+ </module>
+
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="TypeName"/>
+ <module name="AvoidStarImport"/>
+ </module>
<module name="RegexpSingleline">
- <!-- \s matches whitespace character, $ matches end of line. -->
+ <!-- \s matches whitespace character, $ matches end of line.-->
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
- <module name="TreeWalker">
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- </module>
+
+ <!-- some modules that we should soon add
+ <module name="MagicNumber"/> -->
+
+ <!-- some modules that we should soon add -->
</module>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/plugins/network-elements/nicira-nvp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 9341c93..2d88efb 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -42,7 +42,7 @@
</dependencies>
<executions>
<execution>
- <phase>process-sources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 94931a0..38978ac 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
@@ -21,11 +21,16 @@ package com.cloud.agent.api;
*/
public class ConfigurePortForwardingRulesOnLogicalRouterAnswer extends Answer {
- public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command, boolean success, String details) {
+ public ConfigurePortForwardingRulesOnLogicalRouterAnswer(
+ final Command command,
+ final boolean success,
+ final String details) {
super(command, success, details);
}
- public ConfigurePortForwardingRulesOnLogicalRouterAnswer(Command command, Exception e) {
+ public ConfigurePortForwardingRulesOnLogicalRouterAnswer(
+ final Command command,
+ final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 16ef2c4..e0d3f07 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
@@ -28,7 +28,7 @@ public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command
private String logicalRouterUuid;
private List<PortForwardingRuleTO> rules;
- public ConfigurePortForwardingRulesOnLogicalRouterCommand(String logicalRouterUuid, List<PortForwardingRuleTO> rules) {
+ public ConfigurePortForwardingRulesOnLogicalRouterCommand(final String logicalRouterUuid, final List<PortForwardingRuleTO> rules) {
this.logicalRouterUuid = logicalRouterUuid;
this.rules = rules;
}
@@ -37,7 +37,7 @@ public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command
return logicalRouterUuid;
}
- public void setLogicalRouterUuid(String logicalRouterUuid) {
+ public void setLogicalRouterUuid(final String logicalRouterUuid) {
this.logicalRouterUuid = logicalRouterUuid;
}
@@ -45,12 +45,11 @@ public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command
return rules;
}
- public void setRules(List<PortForwardingRuleTO> rules) {
+ public void setRules(final List<PortForwardingRuleTO> rules) {
this.rules = rules;
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see com.cloud.agent.api.Command#executeInSequence()
*/
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 09a3e7e..6226613 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,11 +18,13 @@ package com.cloud.agent.api;
public class ConfigurePublicIpsOnLogicalRouterAnswer extends Answer {
- public ConfigurePublicIpsOnLogicalRouterAnswer(Command command, boolean success, String details) {
+ public ConfigurePublicIpsOnLogicalRouterAnswer(final Command command,
+ final boolean success, final String details) {
super(command, success, details);
}
- public ConfigurePublicIpsOnLogicalRouterAnswer(Command command, Exception e) {
+ public ConfigurePublicIpsOnLogicalRouterAnswer(final Command command,
+ final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 c08f540..9371ea6 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
@@ -24,7 +24,8 @@ public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
private String l3GatewayServiceUuid;
private List<String> publicCidrs;
- public ConfigurePublicIpsOnLogicalRouterCommand(String logicalRouterUuid, String l3GatewayServiceUuid, List<String> publicCidrs) {
+ public ConfigurePublicIpsOnLogicalRouterCommand(final String logicalRouterUuid,
+ final String l3GatewayServiceUuid, final List<String> publicCidrs) {
super();
this.logicalRouterUuid = logicalRouterUuid;
this.publicCidrs = publicCidrs;
@@ -35,7 +36,7 @@ public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
return logicalRouterUuid;
}
- public void setLogicalRouterUuid(String logicalRouterUuid) {
+ public void setLogicalRouterUuid(final String logicalRouterUuid) {
this.logicalRouterUuid = logicalRouterUuid;
}
@@ -43,7 +44,7 @@ public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
return l3GatewayServiceUuid;
}
- public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
+ public void setL3GatewayServiceUuid(final String l3GatewayServiceUuid) {
this.l3GatewayServiceUuid = l3GatewayServiceUuid;
}
@@ -51,7 +52,7 @@ public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
return publicCidrs;
}
- public void setPublicCidrs(List<String> publicCidrs) {
+ public void setPublicCidrs(final List<String> publicCidrs) {
this.publicCidrs = publicCidrs;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 caab316..5d9c72c 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
@@ -26,7 +26,8 @@ public class ConfigureStaticNatRulesOnLogicalRouterAnswer extends Answer {
* @param success
* @param details
*/
- public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command, boolean success, String details) {
+ public ConfigureStaticNatRulesOnLogicalRouterAnswer(final Command command,
+ final boolean success, final String details) {
super(command, success, details);
}
@@ -34,7 +35,8 @@ public class ConfigureStaticNatRulesOnLogicalRouterAnswer extends Answer {
* @param command
* @param e
*/
- public ConfigureStaticNatRulesOnLogicalRouterAnswer(Command command, Exception e) {
+ public ConfigureStaticNatRulesOnLogicalRouterAnswer(final Command command,
+ final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 5f79ffc..6f97745 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
@@ -28,7 +28,8 @@ public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command {
private String logicalRouterUuid;
private List<StaticNatRuleTO> rules;
- public ConfigureStaticNatRulesOnLogicalRouterCommand(String logicalRouterUuid, List<StaticNatRuleTO> rules) {
+ public ConfigureStaticNatRulesOnLogicalRouterCommand(
+ final String logicalRouterUuid, final List<StaticNatRuleTO> rules) {
super();
this.logicalRouterUuid = logicalRouterUuid;
this.rules = rules;
@@ -39,7 +40,7 @@ public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command {
return logicalRouterUuid;
}
- public void setLogicalRouterUuid(String logicalRouterUuid) {
+ public void setLogicalRouterUuid(final String logicalRouterUuid) {
this.logicalRouterUuid = logicalRouterUuid;
}
@@ -47,12 +48,11 @@ public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command {
return rules;
}
- public void setRules(List<StaticNatRuleTO> rules) {
+ public void setRules(final List<StaticNatRuleTO> rules) {
this.rules = rules;
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see com.cloud.agent.api.Command#executeInSequence()
*/
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 72a275b..ee56c17 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
@@ -21,20 +21,20 @@ package com.cloud.agent.api;
*/
public class CreateLogicalRouterAnswer extends Answer {
- private String _logicalRouterUuid;
+ private String logicalRouterUuid;
- public CreateLogicalRouterAnswer(Command command, boolean success,
- String details, String logicalRouterUuid) {
+ public CreateLogicalRouterAnswer(final Command command, final boolean success,
+ final String details, final String logicalRouterUuid) {
super(command, success, details);
- _logicalRouterUuid = logicalRouterUuid;
+ this.logicalRouterUuid = logicalRouterUuid;
}
- public CreateLogicalRouterAnswer(Command command, Exception e) {
+ public CreateLogicalRouterAnswer(final Command command, final Exception e) {
super(command, e);
}
public String getLogicalRouterUuid() {
- return _logicalRouterUuid;
+ return logicalRouterUuid;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 1f3f24e..0f0d7ad 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
@@ -20,28 +20,28 @@ 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) {
+ 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(final String gatewayServiceUuid, final long vlanId,
+ final String logicalSwitchUuid, final String name,
+ final String publicIpCidr, final String publicNextHop,
+ final String internalIpCidr, final String ownerName) {
super();
- _gatewayServiceUuid = gatewayServiceUuid;
- _logicalSwitchUuid = logicalSwitchUuid;
- _vlanId = vlanId;
- _name = name;
- _ownerName = ownerName;
- _publicIpCidr = publicIpCidr;
- _publicNextHop = publicNextHop;
- _internalIpCidr = internalIpCidr;
+ this.gatewayServiceUuid = gatewayServiceUuid;
+ this.logicalSwitchUuid = logicalSwitchUuid;
+ this.vlanId = vlanId;
+ this.name = name;
+ this.ownerName = ownerName;
+ this.publicIpCidr = publicIpCidr;
+ this.publicNextHop = publicNextHop;
+ this.internalIpCidr = internalIpCidr;
}
@Override
@@ -50,66 +50,66 @@ public class CreateLogicalRouterCommand extends Command {
}
public String getGatewayServiceUuid() {
- return _gatewayServiceUuid;
+ return gatewayServiceUuid;
}
- public void setGatewayServiceUuid(String gatewayServiceUuid) {
- _gatewayServiceUuid = gatewayServiceUuid;
+ public void setGatewayServiceUuid(final String gatewayServiceUuid) {
+ this.gatewayServiceUuid = gatewayServiceUuid;
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
- public void setLogicalSwitchUuid(String logicalSwitchUuid) {
- _logicalSwitchUuid = logicalSwitchUuid;
+ public void setLogicalSwitchUuid(final String logicalSwitchUuid) {
+ this.logicalSwitchUuid = logicalSwitchUuid;
}
public long getVlanId() {
- return _vlanId;
+ return vlanId;
}
- public void setVlanId(long vlanId) {
- _vlanId = vlanId;
+ public void setVlanId(final long vlanId) {
+ this.vlanId = vlanId;
}
public String getName() {
- return _name;
+ return name;
}
- public void setName(String name) {
- _name = name;
+ public void setName(final String name) {
+ this.name = name;
}
public String getOwnerName() {
- return _ownerName;
+ return ownerName;
}
- public void setOwnerName(String ownerName) {
- _ownerName = ownerName;
+ public void setOwnerName(final String ownerName) {
+ this.ownerName = ownerName;
}
public String getPublicIpCidr() {
- return _publicIpCidr;
+ return publicIpCidr;
}
- public void setPublicIpCidr(String publicIpCidr) {
- _publicIpCidr = publicIpCidr;
+ public void setPublicIpCidr(final String publicIpCidr) {
+ this.publicIpCidr = publicIpCidr;
}
public String getInternalIpCidr() {
- return _internalIpCidr;
+ return internalIpCidr;
}
- public void setInternalIpCidr(String internalIpCidr) {
- _internalIpCidr = internalIpCidr;
+ public void setInternalIpCidr(final String internalIpCidr) {
+ this.internalIpCidr = internalIpCidr;
}
public String getPublicNextHop() {
- return _publicNextHop;
+ return publicNextHop;
}
- public void setPublicNextHop(String publicNextHop) {
- _publicNextHop = publicNextHop;
+ public void setPublicNextHop(final String publicNextHop) {
+ this.publicNextHop = publicNextHop;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 753edec..76c4c16 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
@@ -17,20 +17,20 @@
package com.cloud.agent.api;
public class CreateLogicalSwitchAnswer extends Answer {
- private String _logicalSwitchUuid;
+ private String logicalSwitchUuid;
- public CreateLogicalSwitchAnswer(Command command, boolean success,
- String details, String logicalSwitchUuid) {
+ public CreateLogicalSwitchAnswer(final Command command, final boolean success,
+ final String details, final String logicalSwitchUuid) {
super(command, success, details);
- _logicalSwitchUuid = logicalSwitchUuid;
+ this.logicalSwitchUuid = logicalSwitchUuid;
}
- public CreateLogicalSwitchAnswer(Command command, Exception e) {
+ public CreateLogicalSwitchAnswer(final Command command, final Exception e) {
super(command, e);
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 b2a5aaf..ab08f70 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
@@ -18,16 +18,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) {
- _transportUuid = transportUuid;
- _transportType = transportType;
- _name = name;
- _ownerName = ownerName;
+ private final String transportUuid;
+ private final String transportType;
+ private final String name;
+ private final String ownerName;
+
+ public CreateLogicalSwitchCommand(final String transportUuid, final String transportType,
+ final String name, final String ownerName) {
+ this.transportUuid = transportUuid;
+ this.transportType = transportType;
+ this.name = name;
+ this.ownerName = ownerName;
}
@Override
@@ -36,19 +37,19 @@ public class CreateLogicalSwitchCommand extends Command {
}
public String getTransportUuid() {
- return _transportUuid;
+ return transportUuid;
}
public String getTransportType() {
- return _transportType;
+ return transportType;
}
public String getName() {
- return _name;
+ return name;
}
public String getOwnerName() {
- return _ownerName;
+ return ownerName;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 8fa7927..c884c74 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
@@ -17,19 +17,19 @@
package com.cloud.agent.api;
public class CreateLogicalSwitchPortAnswer extends Answer {
- private String _logicalSwitchPortUuid;
+ private String logicalSwitchPortUuid;
- public CreateLogicalSwitchPortAnswer(Command command, boolean success,
- String details, String localSwitchPortUuid) {
+ public CreateLogicalSwitchPortAnswer(final Command command, final boolean success,
+ final String details, final String localSwitchPortUuid) {
super(command, success, details);
- _logicalSwitchPortUuid = localSwitchPortUuid;
+ logicalSwitchPortUuid = localSwitchPortUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwitchPortUuid;
+ return logicalSwitchPortUuid;
}
- public CreateLogicalSwitchPortAnswer(Command command, Exception e) {
+ public CreateLogicalSwitchPortAnswer(final Command command, final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 fe3f683..bc0c921 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
@@ -17,36 +17,37 @@
package com.cloud.agent.api;
public class CreateLogicalSwitchPortCommand extends Command {
- private String _logicalSwitchUuid;
- private String _attachmentUuid;
- private String _ownerName;
- private String _nicName;
-
- public CreateLogicalSwitchPortCommand(String logicalSwitchUuid, String attachmentUuid, String ownerName, String nicName) {
- _logicalSwitchUuid = logicalSwitchUuid;
- _attachmentUuid = attachmentUuid;
- _ownerName = ownerName;
- _nicName = nicName;
+ private final String logicalSwitchUuid;
+ private final String attachmentUuid;
+ private final String ownerName;
+ private final String nicName;
+
+ public CreateLogicalSwitchPortCommand(final String logicalSwitchUuid,
+ final String attachmentUuid, final String ownerName, final String nicName) {
+ this.logicalSwitchUuid = logicalSwitchUuid;
+ this.attachmentUuid = attachmentUuid;
+ this.ownerName = ownerName;
+ this.nicName = nicName;
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
public String getAttachmentUuid() {
- return _attachmentUuid;
+ return attachmentUuid;
}
public String getOwnerName() {
- return _ownerName;
+ return ownerName;
}
public String getNicName() {
- return _nicName;
+ return nicName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 db07547..4799637 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
@@ -21,12 +21,12 @@ package com.cloud.agent.api;
*/
public class DeleteLogicalRouterAnswer extends Answer {
- public DeleteLogicalRouterAnswer(Command command, boolean success,
- String details) {
+ public DeleteLogicalRouterAnswer(final Command command,
+ final boolean success, final String details) {
super(command, success, details);
}
- public DeleteLogicalRouterAnswer(Command command, Exception e) {
+ public DeleteLogicalRouterAnswer(final Command command, final Exception e) {
super(command, e);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 96e2cb9..ee59007 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
@@ -21,14 +21,13 @@ package com.cloud.agent.api;
*/
public class DeleteLogicalRouterCommand extends Command {
- private String _logicalRouterUuid;
+ private final String logicalRouterUuid;
public DeleteLogicalRouterCommand(String logicalRouterUuid) {
- _logicalRouterUuid = logicalRouterUuid;
+ this.logicalRouterUuid = logicalRouterUuid;
}
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see com.cloud.agent.api.Command#executeInSequence()
*/
@Override
@@ -37,6 +36,6 @@ public class DeleteLogicalRouterCommand extends Command {
}
public String getLogicalRouterUuid() {
- return _logicalRouterUuid;
+ return logicalRouterUuid;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java
index e9cfbc4..e633099 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java
@@ -18,12 +18,12 @@ package com.cloud.agent.api;
public class DeleteLogicalSwitchAnswer extends Answer {
- public DeleteLogicalSwitchAnswer(Command command, boolean success,
- String details) {
+ public DeleteLogicalSwitchAnswer(final Command command,
+ final boolean success, final String details) {
super(command, success, details);
}
- public DeleteLogicalSwitchAnswer(Command command, Exception e) {
+ public DeleteLogicalSwitchAnswer(final Command command, final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 25aa339..3a7ba1d 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
@@ -18,10 +18,10 @@ package com.cloud.agent.api;
public class DeleteLogicalSwitchCommand extends Command {
- private String _logicalSwitchUuid;
+ private final String logicalSwitchUuid;
- public DeleteLogicalSwitchCommand(String logicalSwitchUuid) {
- _logicalSwitchUuid = logicalSwitchUuid;
+ public DeleteLogicalSwitchCommand(final String logicalSwitchUuid) {
+ this.logicalSwitchUuid = logicalSwitchUuid;
}
@Override
@@ -30,6 +30,6 @@ public class DeleteLogicalSwitchCommand extends Command {
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java
index f779677..d3d2e72 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java
@@ -18,12 +18,12 @@ package com.cloud.agent.api;
public class DeleteLogicalSwitchPortAnswer extends Answer {
- public DeleteLogicalSwitchPortAnswer(Command command, boolean success,
- String details) {
+ public DeleteLogicalSwitchPortAnswer(final Command command,
+ final boolean success, final String details) {
super(command, success, details);
}
- public DeleteLogicalSwitchPortAnswer(Command command, Exception e) {
+ public DeleteLogicalSwitchPortAnswer(final Command command, final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 e91a032..df06fa3 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
@@ -17,20 +17,20 @@
package com.cloud.agent.api;
public class DeleteLogicalSwitchPortCommand extends Command {
- private String _logicalSwitchUuid;
- private String _logicalSwithPortUuid;
+ private final String logicalSwitchUuid;
+ private final String logicalSwithPortUuid;
- public DeleteLogicalSwitchPortCommand(String logicalSwitchUuid, String logicalSwitchPortUuid) {
- _logicalSwitchUuid = logicalSwitchUuid;
- _logicalSwithPortUuid = logicalSwitchPortUuid;
+ public DeleteLogicalSwitchPortCommand(final String logicalSwitchUuid, final String logicalSwitchPortUuid) {
+ this.logicalSwitchUuid = logicalSwitchUuid;
+ logicalSwithPortUuid = logicalSwitchPortUuid;
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwithPortUuid;
+ return logicalSwithPortUuid;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 edc0c5f..f70a6e1 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
@@ -17,19 +17,19 @@
package com.cloud.agent.api;
public class FindLogicalSwitchPortAnswer extends Answer {
- private String _logicalSwitchPortUuid;
+ private String logicalSwitchPortUuid;
- public FindLogicalSwitchPortAnswer(Command command, boolean success,
- String details, String localSwitchPortUuid) {
+ public FindLogicalSwitchPortAnswer(final Command command, final boolean success,
+ final String details, final String localSwitchPortUuid) {
super(command, success, details);
- _logicalSwitchPortUuid = localSwitchPortUuid;
+ logicalSwitchPortUuid = localSwitchPortUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwitchPortUuid;
+ return logicalSwitchPortUuid;
}
- public FindLogicalSwitchPortAnswer(Command command, Exception e) {
+ public FindLogicalSwitchPortAnswer(final Command command, final Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 b737c50..1635db9 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,22 +17,22 @@
package com.cloud.agent.api;
public class FindLogicalSwitchPortCommand extends Command {
- private String _logicalSwitchUuid;
- private String _logicalSwitchPortUuid;
+ private final String logicalSwitchUuid;
+ private final String logicalSwitchPortUuid;
public FindLogicalSwitchPortCommand(String logicalSwitchUuid, String logicalSwitchPortUuid) {
- _logicalSwitchUuid = logicalSwitchUuid;
- _logicalSwitchPortUuid = logicalSwitchPortUuid;
+ this.logicalSwitchUuid = logicalSwitchUuid;
+ this.logicalSwitchPortUuid = logicalSwitchPortUuid;
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwitchPortUuid;
+ return logicalSwitchPortUuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 f4c4130..02195aa 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
@@ -17,16 +17,16 @@
package com.cloud.agent.api;
public class UpdateLogicalSwitchPortAnswer extends Answer {
- private String _logicalSwitchPortUuid;
+ private String logicalSwitchPortUuid;
public UpdateLogicalSwitchPortAnswer(Command command, boolean success,
String details, String localSwitchPortUuid) {
super(command, success, details);
- _logicalSwitchPortUuid = localSwitchPortUuid;
+ logicalSwitchPortUuid = localSwitchPortUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwitchPortUuid;
+ return logicalSwitchPortUuid;
}
public UpdateLogicalSwitchPortAnswer(Command command, Exception e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 1b8b590..79f4be6 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
@@ -17,43 +17,44 @@
package com.cloud.agent.api;
public class UpdateLogicalSwitchPortCommand extends Command {
- private String _logicalSwitchUuid;
- private String _logicalSwitchPortUuid;
- private String _attachmentUuid;
- private String _ownerName;
- private String _nicName;
+ private final String logicalSwitchUuid;
+ private final String logicalSwitchPortUuid;
+ private final String attachmentUuid;
+ private final String ownerName;
+ private final String nicName;
- public UpdateLogicalSwitchPortCommand(String logicalSwitchPortUuid, String logicalSwitchUuid, String attachmentUuid, String ownerName, String nicName) {
- _logicalSwitchUuid = logicalSwitchUuid;
- _logicalSwitchPortUuid = logicalSwitchPortUuid;
- _attachmentUuid = attachmentUuid;
- _ownerName = ownerName;
- _nicName = nicName;
+ public UpdateLogicalSwitchPortCommand(final String logicalSwitchPortUuid, final String logicalSwitchUuid,
+ final String attachmentUuid, final String ownerName, final String nicName) {
+ this.logicalSwitchUuid = logicalSwitchUuid;
+ this.logicalSwitchPortUuid = logicalSwitchPortUuid;
+ this.attachmentUuid = attachmentUuid;
+ this.ownerName = ownerName;
+ this.nicName = nicName;
}
public String getLogicalSwitchUuid() {
- return _logicalSwitchUuid;
+ return logicalSwitchUuid;
}
public String getLogicalSwitchPortUuid() {
- return _logicalSwitchPortUuid;
+ return logicalSwitchPortUuid;
}
public String getAttachmentUuid() {
- return _attachmentUuid;
+ return attachmentUuid;
}
public String getOwnerName() {
- return _ownerName;
+ return ownerName;
}
public String getNicName() {
- return _nicName;
+ return nicName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 937b665..8f8a917 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,8 +18,6 @@ package com.cloud.api.commands;
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;
@@ -42,9 +40,9 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "addNiciraNvpDevice", responseObject=NiciraNvpDeviceResponse.class, description="Adds a Nicira NVP device")
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;
+ @Inject
+ protected NiciraNvpElementService niciraNvpElementService;
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -63,10 +61,12 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
@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")
+ @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")
+ @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;
/////////////////////////////////////////////////////
@@ -104,9 +104,9 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
try {
- NiciraNvpDeviceVO niciraNvpDeviceVO = _niciraNvpElementService.addNiciraNvpDevice(this);
+ NiciraNvpDeviceVO niciraNvpDeviceVO = niciraNvpElementService.addNiciraNvpDevice(this);
if (niciraNvpDeviceVO != null) {
- NiciraNvpDeviceResponse response = _niciraNvpElementService.createNiciraNvpDeviceResponse(niciraNvpDeviceVO);
+ NiciraNvpDeviceResponse response = niciraNvpElementService.createNiciraNvpDeviceResponse(niciraNvpDeviceVO);
response.setObjectName("niciranvpdevice");
response.setResponseName(getCommandName());
setResponseObject(response);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 6eb6764..46a9fad 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,18 +18,17 @@ package com.cloud.api.commands;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
+import com.cloud.api.response.NiciraNvpDeviceResponse;
-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.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;
@@ -41,9 +40,9 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "deleteNiciraNvpDevice", responseObject=SuccessResponse.class, description=" delete a nicira nvp device")
public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd {
- private static final Logger s_logger = Logger.getLogger(DeleteNiciraNvpDeviceCmd.class.getName());
private static final String s_name = "deleteniciranvpdeviceresponse";
- @Inject NiciraNvpElementService _niciraNvpElementService;
+ @Inject
+ protected NiciraNvpElementService niciraNvpElementService;
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -68,7 +67,7 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
try {
- boolean result = _niciraNvpElementService.deleteNiciraNvpDevice(this);
+ boolean result = niciraNvpElementService.deleteNiciraNvpDevice(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
response.setResponseName(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 53203a7..8595522 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,17 @@ 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.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;
@@ -47,7 +46,8 @@ public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNiciraNvpDeviceNetworksCmd.class.getName());
private static final String s_name = "listniciranvpdevicenetworks";
- @Inject NiciraNvpElementService _niciraNvpElementService;
+ @Inject
+ protected NiciraNvpElementService niciraNvpElementService;
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -72,7 +72,7 @@ public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
try {
- List<? extends Network> networks = _niciraNvpElementService.listNiciraNvpDeviceNetworks(this);
+ List<? extends Network> networks = niciraNvpElementService.listNiciraNvpDeviceNetworks(this);
ListResponse<NetworkResponse> response = new ListResponse<NetworkResponse>();
List<NetworkResponse> networkResponses = new ArrayList<NetworkResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 3e02e19..8d5ac4a 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,19 +21,16 @@ 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.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.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;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
@@ -44,11 +41,12 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "listNiciraNvpDevices", responseObject=NiciraNvpDeviceResponse.class, description="Lists Nicira NVP devices")
public class ListNiciraNvpDevicesCmd extends BaseListCmd {
- private static final Logger s_logger = Logger.getLogger(ListNiciraNvpDevicesCmd.class.getName());
private static final String s_name = "listniciranvpdeviceresponse";
- @Inject NiciraNvpElementService _niciraNvpElementService;
- /////////////////////////////////////////////////////
+ @Inject
+ protected NiciraNvpElementService niciraNvpElementService;
+
+ /////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
@@ -77,15 +75,15 @@ public class ListNiciraNvpDevicesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
try {
- List<NiciraNvpDeviceVO> niciraDevices = _niciraNvpElementService.listNiciraNvpDevices(this);
+ List<NiciraNvpDeviceVO> niciraDevices = niciraNvpElementService.listNiciraNvpDevices(this);
ListResponse<NiciraNvpDeviceResponse> response = new ListResponse<NiciraNvpDeviceResponse>();
List<NiciraNvpDeviceResponse> niciraDevicesResponse = new ArrayList<NiciraNvpDeviceResponse>();
if (niciraDevices != null && !niciraDevices.isEmpty()) {
for (NiciraNvpDeviceVO niciraDeviceVO : niciraDevices) {
- NiciraNvpDeviceResponse niciraDeviceResponse = _niciraNvpElementService.createNiciraNvpDeviceResponse(niciraDeviceVO);
+ NiciraNvpDeviceResponse niciraDeviceResponse = niciraNvpElementService.createNiciraNvpDeviceResponse(niciraDeviceVO);
niciraDevicesResponse.add(niciraDeviceResponse);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 d6085e2..8612480 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,15 +16,13 @@
// under the License.
package com.cloud.api.response;
-import com.google.gson.annotations.SerializedName;
-
+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.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")
@@ -49,30 +47,30 @@ public class NiciraNvpDeviceResponse extends BaseResponse {
private String l3GatewayServiceUuid;
public void setId(String nvpDeviceId) {
- id = nvpDeviceId;
+ this.id = nvpDeviceId;
}
- public void setPhysicalNetworkId(String physicalNetworkId) {
+ public void setPhysicalNetworkId(final String physicalNetworkId) {
this.physicalNetworkId = physicalNetworkId;
}
- public void setProviderName(String providerName) {
+ public void setProviderName(final String providerName) {
this.providerName = providerName;
}
- public void setDeviceName(String deviceName) {
+ public void setDeviceName(final String deviceName) {
this.deviceName = deviceName;
}
- public void setHostName(String hostName) {
+ public void setHostName(final String hostName) {
this.hostName = hostName;
}
- public void setTransportZoneUuid(String transportZoneUuid) {
+ public void setTransportZoneUuid(final String transportZoneUuid) {
this.transportZoneUuid = transportZoneUuid;
}
- public void setL3GatewayServiceUuid(String l3GatewayServiceUuid) {
+ public void setL3GatewayServiceUuid(final String l3GatewayServiceUuid) {
this.l3GatewayServiceUuid = l3GatewayServiceUuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 3832123..d4dd8d9 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
@@ -56,8 +56,8 @@ public class NiciraNvpDeviceVO implements InternalIdentity {
uuid = UUID.randomUUID().toString();
}
- public NiciraNvpDeviceVO(long hostId, long physicalNetworkId,
- String providerName, String deviceName) {
+ public NiciraNvpDeviceVO(final long hostId, final long physicalNetworkId,
+ final String providerName, final String deviceName) {
super();
this.hostId = hostId;
this.physicalNetworkId = physicalNetworkId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 d9dbb02..d329a87 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
@@ -46,7 +46,7 @@ public class NiciraNvpNicMappingVO implements InternalIdentity {
public NiciraNvpNicMappingVO () {
}
- public NiciraNvpNicMappingVO (String logicalSwitchUuid, String logicalSwitchPortUuid, String nicUuid) {
+ public NiciraNvpNicMappingVO (final String logicalSwitchUuid, final String logicalSwitchPortUuid, final String nicUuid) {
this.logicalSwitchUuid = logicalSwitchUuid;
this.logicalSwitchPortUuid = logicalSwitchPortUuid;
this.nicUuid = nicUuid;
@@ -56,7 +56,7 @@ public class NiciraNvpNicMappingVO implements InternalIdentity {
return logicalSwitchUuid;
}
- public void setLogicalSwitchUuid(String logicalSwitchUuid) {
+ public void setLogicalSwitchUuid(final String logicalSwitchUuid) {
this.logicalSwitchUuid = logicalSwitchUuid;
}
@@ -64,7 +64,7 @@ public class NiciraNvpNicMappingVO implements InternalIdentity {
return logicalSwitchPortUuid;
}
- public void setLogicalSwitchPortUuid(String logicalSwitchPortUuid) {
+ public void setLogicalSwitchPortUuid(final String logicalSwitchPortUuid) {
this.logicalSwitchPortUuid = logicalSwitchPortUuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 1e2a831..fe7d5c2 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
@@ -28,6 +28,7 @@ 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")
@@ -42,12 +43,12 @@ public class NiciraNvpRouterMappingVO implements InternalIdentity {
public NiciraNvpRouterMappingVO() {
}
- public NiciraNvpRouterMappingVO(String logicalRouterUuid, long networkId) {
+ public NiciraNvpRouterMappingVO(final String logicalRouterUuid, final long networkId) {
this.logicalRouterUuid = logicalRouterUuid;
this.networkId = networkId;
}
- public NiciraNvpRouterMappingVO(long id, String logicalRouterUuid, long networkId) {
+ public NiciraNvpRouterMappingVO(final long id, final String logicalRouterUuid, final long networkId) {
this.id = id;
this.logicalRouterUuid = logicalRouterUuid;
this.networkId = networkId;
@@ -58,7 +59,7 @@ public class NiciraNvpRouterMappingVO implements InternalIdentity {
return id;
}
- public void setId(long id) {
+ public void setId(final long id) {
this.id = id;
}
@@ -66,7 +67,7 @@ public class NiciraNvpRouterMappingVO implements InternalIdentity {
return logicalRouterUuid;
}
- public void setLogicalRouterUuid(String logicalRouterUuid) {
+ public void setLogicalRouterUuid(final String logicalRouterUuid) {
this.logicalRouterUuid = logicalRouterUuid;
}
@@ -74,7 +75,7 @@ public class NiciraNvpRouterMappingVO implements InternalIdentity {
return networkId;
}
- public void setNetworkId(long networkId) {
+ public void setNetworkId(final long networkId) {
this.networkId = networkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 5e07246..2f53a85 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,7 +31,7 @@ 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;
@@ -42,7 +42,7 @@ implements NiciraNvpDao {
}
@Override
- public List<NiciraNvpDeviceVO> listByPhysicalNetwork(long physicalNetworkId) {
+ public List<NiciraNvpDeviceVO> listByPhysicalNetwork(final long physicalNetworkId) {
SearchCriteria<NiciraNvpDeviceVO> sc = physicalNetworkIdSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
return search(sc, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 f693dcb..1c4754f 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,12 +21,9 @@ 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/876b7e49/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 1a0fcd1..5c5097c 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,7 +29,7 @@ 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;
@@ -40,7 +40,7 @@ GenericDaoBase<NiciraNvpNicMappingVO, Long> implements NiciraNvpNicMappingDao {
}
@Override
- public NiciraNvpNicMappingVO findByNicUuid(String nicUuid) {
+ public NiciraNvpNicMappingVO findByNicUuid(final String nicUuid) {
SearchCriteria<NiciraNvpNicMappingVO> sc = nicSearch.create();
sc.setParameters("nicUuid", nicUuid);
return findOneBy(sc);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876b7e49/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 dc41f57..06331e1 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
@@ -39,10 +39,11 @@ public class NiciraNvpRouterMappingDaoImpl extends GenericDaoBase<NiciraNvpRoute
}
@Override
- public NiciraNvpRouterMappingVO findByNetworkId(long id) {
+ public NiciraNvpRouterMappingVO findByNetworkId(final long id) {
SearchCriteria<NiciraNvpRouterMappingVO> sc = networkSearch.create();
sc.setParameters("network_id", id);
return findOneBy(sc);
}
+
}