You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/02/15 03:10:22 UTC
[1/3] git commit: updated refs/heads/master to deb55ac
Repository: cloudstack
Updated Branches:
refs/heads/master e1e16a230 -> deb55acd1
CLOUDSTACK-5779: Fix missing clean up period for VR
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/161e7d93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/161e7d93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/161e7d93
Branch: refs/heads/master
Commit: 161e7d93ca9d03e9aa7e7be9e12d1ad337de9b14
Parents: e1e16a2
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Feb 14 17:28:55 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Feb 14 18:10:00 2014 -0800
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 62 ++++++++++++--------
.../xen/resource/CitrixResourceBase.java | 2 +-
2 files changed, 37 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/161e7d93/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 3efbe33..0b90cc9 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -109,59 +109,69 @@ public class VirtualRoutingResource {
return new Answer(cmd, false, rc.getDetails());
}
+ Answer answer;
if (cmd instanceof SetPortForwardingRulesVpcCommand) {
- return execute((SetPortForwardingRulesVpcCommand)cmd);
+ answer = execute((SetPortForwardingRulesVpcCommand)cmd);
} else if (cmd instanceof SetPortForwardingRulesCommand) {
- return execute((SetPortForwardingRulesCommand)cmd);
+ answer = execute((SetPortForwardingRulesCommand)cmd);
} else if (cmd instanceof SetStaticRouteCommand) {
- return execute((SetStaticRouteCommand)cmd);
+ answer = execute((SetStaticRouteCommand)cmd);
} else if (cmd instanceof SetStaticNatRulesCommand) {
- return execute((SetStaticNatRulesCommand)cmd);
+ answer = execute((SetStaticNatRulesCommand)cmd);
} else if (cmd instanceof LoadBalancerConfigCommand) {
- return execute((LoadBalancerConfigCommand)cmd);
+ answer = execute((LoadBalancerConfigCommand)cmd);
} else if (cmd instanceof SavePasswordCommand) {
- return execute((SavePasswordCommand)cmd);
+ answer = execute((SavePasswordCommand)cmd);
} else if (cmd instanceof DhcpEntryCommand) {
- return execute((DhcpEntryCommand)cmd);
+ answer = execute((DhcpEntryCommand)cmd);
} else if (cmd instanceof CreateIpAliasCommand) {
- return execute((CreateIpAliasCommand)cmd);
+ answer = execute((CreateIpAliasCommand)cmd);
} else if (cmd instanceof DnsMasqConfigCommand) {
- return execute((DnsMasqConfigCommand)cmd);
+ answer = execute((DnsMasqConfigCommand)cmd);
} else if (cmd instanceof DeleteIpAliasCommand) {
- return execute((DeleteIpAliasCommand)cmd);
+ answer = execute((DeleteIpAliasCommand)cmd);
} else if (cmd instanceof VmDataCommand) {
- return execute((VmDataCommand)cmd);
+ answer = execute((VmDataCommand)cmd);
} else if (cmd instanceof CheckRouterCommand) {
- return execute((CheckRouterCommand)cmd);
+ answer = execute((CheckRouterCommand)cmd);
} else if (cmd instanceof SetFirewallRulesCommand) {
- return execute((SetFirewallRulesCommand)cmd);
+ answer = execute((SetFirewallRulesCommand)cmd);
} else if (cmd instanceof BumpUpPriorityCommand) {
- return execute((BumpUpPriorityCommand)cmd);
+ answer = execute((BumpUpPriorityCommand)cmd);
} else if (cmd instanceof RemoteAccessVpnCfgCommand) {
- return execute((RemoteAccessVpnCfgCommand)cmd);
+ answer = execute((RemoteAccessVpnCfgCommand)cmd);
} else if (cmd instanceof VpnUsersCfgCommand) {
- return execute((VpnUsersCfgCommand)cmd);
+ answer = execute((VpnUsersCfgCommand)cmd);
} else if (cmd instanceof GetDomRVersionCmd) {
- return execute((GetDomRVersionCmd)cmd);
+ answer = execute((GetDomRVersionCmd)cmd);
} else if (cmd instanceof Site2SiteVpnCfgCommand) {
- return execute((Site2SiteVpnCfgCommand)cmd);
+ answer = execute((Site2SiteVpnCfgCommand)cmd);
} else if (cmd instanceof CheckS2SVpnConnectionsCommand) {
- return execute((CheckS2SVpnConnectionsCommand)cmd);
+ answer = execute((CheckS2SVpnConnectionsCommand)cmd);
} else if (cmd instanceof SetMonitorServiceCommand) {
- return execute((SetMonitorServiceCommand)cmd);
+ answer = execute((SetMonitorServiceCommand)cmd);
} else if (cmd instanceof SetupGuestNetworkCommand) {
- return execute((SetupGuestNetworkCommand)cmd);
+ answer = execute((SetupGuestNetworkCommand)cmd);
} else if (cmd instanceof SetNetworkACLCommand) {
- return execute((SetNetworkACLCommand)cmd);
+ answer = execute((SetNetworkACLCommand)cmd);
} else if (cmd instanceof SetSourceNatCommand) {
- return execute((SetSourceNatCommand)cmd);
+ answer = execute((SetSourceNatCommand)cmd);
} else if (cmd instanceof IpAssocVpcCommand) {
- return execute((IpAssocVpcCommand)cmd);
+ answer = execute((IpAssocVpcCommand)cmd);
} else if (cmd instanceof IpAssocCommand) {
- return execute((IpAssocCommand)cmd);
+ answer = execute((IpAssocCommand)cmd);
} else {
- return Answer.createUnsupportedCommandAnswer(cmd);
+ answer = Answer.createUnsupportedCommandAnswer(cmd);
}
+
+ rc = _vrDeployer.cleanupCommand((NetworkElementCommand)cmd);
+ if (!rc.isSuccess()) {
+ s_logger.error("Failed to clean up VR command due to " + rc.getDetails());
+ // TODO fail it more properly in the future, some commands may need specific answer rather than generic answer
+ answer = new Answer(cmd, false, rc.getDetails());
+ }
+
+ return answer;
} catch (final IllegalArgumentException e) {
return new Answer(cmd, false, e.getMessage());
} finally {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/161e7d93/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 2cabc58..e463072 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -569,7 +569,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
@Override
public ExecutionResult cleanupCommand(NetworkElementCommand cmd) {
if (cmd instanceof IpAssocCommand && !(cmd instanceof IpAssocVpcCommand)) {
- cleanupNetworkElementCommand((IpAssocCommand)cmd);
+ return cleanupNetworkElementCommand((IpAssocCommand)cmd);
}
return new ExecutionResult(true, null);
}
[3/3] git commit: updated refs/heads/master to deb55ac
Posted by ya...@apache.org.
CLOUDSTACK-6047: Made VR scripts name to constant string
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/deb55acd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/deb55acd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/deb55acd
Branch: refs/heads/master
Commit: deb55acd142a9bcc81daa50256809afebc1db901
Parents: 6bde675
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Feb 14 17:28:55 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Feb 14 18:10:11 2014 -0800
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 91 +++++++++++++-------
1 file changed, 61 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deb55acd/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index a287ada..9440897 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -87,6 +87,37 @@ import java.util.Map;
* }
**/
public class VirtualRoutingResource {
+ protected class VRScripts {
+ protected static final String S2SVPN_CHECK = "checkbatchs2svpn.sh";
+ protected static final String S2SVPN_IPSEC = "ipsectunnel.sh";
+ protected static final String DHCP = "edithosts.sh";
+ protected static final String DNSMASQ_CONFIG = "dnsmasq.sh";
+ protected static final String FIREWALL_EGRESS = "firewall_egress.sh";
+ protected static final String FIREWALL_INGRESS = "firewall_ingress.sh";
+ protected static final String FIREWALL_NAT = "firewall_nat.sh";
+ protected static final String IPALIAS_CREATE = "createipAlias.sh";
+ protected static final String IPALIAS_DELETE = "deleteipAlias.sh";
+ protected static final String IPASSOC = "ipassoc.sh";
+ protected static final String LB = "loadbalancer.sh";
+ protected static final String MONITOR_SERVICE = "monitor_service.sh";
+ protected static final String PASSWORD = "savepassword.sh";
+ protected static final String RVR_CHECK = "checkrouter.sh";
+ protected static final String RVR_BUMPUP_PRI = "bumpup_priority.sh";
+ protected static final String VMDATA = "vmdata.py";
+ protected static final String VERSION = "get_template_version.sh";
+ protected static final String VPC_ACL = "vpc_acl.sh";
+ protected static final String VPC_GUEST_NETWORK = "vpc_guestnw.sh";
+ protected static final String VPC_IPASSOC = "vpc_ipassoc.sh";
+ protected static final String VPC_LB = "vpc_loadbalancer.sh";
+ protected static final String VPC_PRIVATEGW = "vpc_privateGateway.sh";
+ protected static final String VPC_PRIVATEGW_ACL = "vpc_privategw_acl.sh";
+ protected static final String VPC_PORTFORWARDING = "vpc_portforwarding.sh";
+ protected static final String VPC_SOURCE_NAT = "vpc_snat.sh";
+ protected static final String VPC_STATIC_NAT = "vpc_staticnat.sh";
+ protected static final String VPC_STATIC_ROUTE = "vpc_staticroute.sh";
+ protected static final String VPN_L2TP = "vpn_l2tp.sh";
+ }
+
private static final Logger s_logger = Logger.getLogger(VirtualRoutingResource.class);
private VirtualRouterDeployer _vrDeployer;
@@ -190,7 +221,7 @@ public class VirtualRoutingResource {
args += "-u ";
args += userpwd.getUsernamePassword();
}
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpn_l2tp.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPN_L2TP, args);
if (!result.isSuccess()) {
return new Answer(cmd, false, "Configure VPN user failed for user " + userpwd.getUsername() + ":" + result.getDetails());
}
@@ -217,7 +248,7 @@ public class VirtualRoutingResource {
}
args += " -C " + cmd.getLocalCidr();
args += " -i " + cmd.getPublicInterface();
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpn_l2tp.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPN_L2TP, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -259,9 +290,9 @@ public class VirtualRoutingResource {
ExecutionResult result;
if (trafficType == FirewallRule.TrafficType.Egress) {
- result = _vrDeployer.executeInVR(routerAccessIp, "firewall_egress.sh", args);
+ result = _vrDeployer.executeInVR(routerAccessIp, VRScripts.FIREWALL_EGRESS, args);
} else {
- result = _vrDeployer.executeInVR(routerAccessIp, "firewall_ingress.sh", args);
+ result = _vrDeployer.executeInVR(routerAccessIp, VRScripts.FIREWALL_INGRESS, args);
}
if (!result.isSuccess()) {
@@ -288,7 +319,7 @@ public class VirtualRoutingResource {
args.append(" -r ").append(rule.getDstIp());
args.append(" -d ").append(rule.getStringDstPortRange());
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "firewall_nat.sh", args.toString());
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.FIREWALL_NAT, args.toString());
if (!result.isSuccess()) {
results[i++] = "Failed";
@@ -311,7 +342,7 @@ public class VirtualRoutingResource {
args += " -l " + rule.getSrcIp();
args += " -r " + rule.getDstIp();
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpc_staticnat.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPC_STATIC_NAT, args);
if (!result.isSuccess()) {
results[i++] = null;
@@ -345,7 +376,7 @@ public class VirtualRoutingResource {
args.append(" -d ").append(rule.getStringSrcPortRange());
args.append(" -G ");
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "firewall_nat.sh", args.toString());
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.FIREWALL_NAT, args.toString());
if (!result.isSuccess()) {
results[i++] = "Failed";
@@ -416,10 +447,10 @@ public class VirtualRoutingResource {
if (cmd.getVpcId() == null) {
args = " -i " + routerIp + args;
- result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "loadbalancer.sh", args);
+ result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.LB, args);
} else {
args = " -i " + cmd.getNic().getIp() + args;
- result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpc_loadbalancer.sh", args);
+ result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPC_LB, args);
}
return new Answer(cmd, result.isSuccess(), result.getDetails());
@@ -437,7 +468,7 @@ public class VirtualRoutingResource {
String args = "-d " + json;
- final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vmdata.py", args);
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VMDATA, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -449,7 +480,7 @@ public class VirtualRoutingResource {
String args = "-v " + vmIpAddress;
args += " -p " + password;
- ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, "savepassword.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, VRScripts.PASSWORD, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -481,7 +512,7 @@ public class VirtualRoutingResource {
args += " -N";
}
- final ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), "edithosts.sh", args);
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), VRScripts.DHCP, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -491,7 +522,7 @@ public class VirtualRoutingResource {
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args + ipaliasto.getAlias_count() + ":" + ipaliasto.getRouterip() + ":" + ipaliasto.getNetmask() + "-";
}
- final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "createipAlias.sh", args);
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.IPALIAS_CREATE, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -507,7 +538,7 @@ public class VirtualRoutingResource {
for (IpAliasTO ipAliasTO : activeIpAliasTOs) {
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
}
- final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "deleteipAlias.sh", args);
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.IPALIAS_DELETE, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -517,7 +548,7 @@ public class VirtualRoutingResource {
for (DhcpTO dhcpTo : dhcpTos) {
args = args + dhcpTo.getRouterIp() + ":" + dhcpTo.getGateway() + ":" + dhcpTo.getNetmask() + ":" + dhcpTo.getStartIpOfSubnet() + "-";
}
- final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "dnsmasq.sh", args);
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.DNSMASQ_CONFIG, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -529,14 +560,14 @@ public class VirtualRoutingResource {
args += ip + " ";
}
- ExecutionResult result = _vrDeployer.executeInVR(routerIP, "checkbatchs2svpn.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIP, VRScripts.S2SVPN_CHECK, args);
return new CheckS2SVpnConnectionsAnswer(cmd, result.isSuccess(), result.getDetails());
}
protected Answer execute(CheckRouterCommand cmd) {
final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- final ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, "checkrouter.sh", null);
+ final ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, VRScripts.RVR_CHECK, null);
if (!result.isSuccess()) {
return new CheckRouterAnswer(cmd, result.getDetails());
}
@@ -544,14 +575,14 @@ public class VirtualRoutingResource {
}
protected Answer execute(BumpUpPriorityCommand cmd) {
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), "bumpup_priority.sh", null);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), VRScripts.RVR_BUMPUP_PRI, null);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
protected Answer execute(GetDomRVersionCmd cmd) {
final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- final ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, "get_template_version.sh", null);
+ final ExecutionResult result = _vrDeployer.executeInVR(routerPrivateIPAddress, VRScripts.VERSION, null);
if (!result.isSuccess()) {
return new GetDomRVersionAnswer(cmd, "GetDomRVersionCmd failed");
}
@@ -604,7 +635,7 @@ public class VirtualRoutingResource {
args += " -N ";
args += cmd.getPeerGuestCidrList();
}
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), "ipsectunnel.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), VRScripts.S2SVPN_IPSEC, args);
if (!result.isSuccess()) {
return new Answer(cmd, false, "Configure site to site VPN failed due to " + result.getDetails());
}
@@ -621,7 +652,7 @@ public class VirtualRoutingResource {
args = args + " -d";
}
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "monitor_service.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.MONITOR_SERVICE, args);
if (!result.isSuccess()) {
return new Answer(cmd, false, result.getDetails());
@@ -663,7 +694,7 @@ public class VirtualRoutingResource {
if (domainName != null && !domainName.isEmpty()) {
args += " -e " + domainName;
}
- ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_guestnw.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIP, VRScripts.VPC_GUEST_NETWORK, args);
if (!result.isSuccess()) {
return new Answer(cmd, false, "Creating guest network failed due to " + result.getDetails());
@@ -695,12 +726,12 @@ public class VirtualRoutingResource {
args += " -M " + nic.getMac();
if (privateGw != null) {
args += " -a " + rule;
- result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpc_privategw_acl.sh", args);
+ result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPC_PRIVATEGW_ACL, args);
} else {
args += " -i " + nic.getIp();
args += " -m " + netmask;
args += " -a " + rule;
- result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpc_acl.sh", args);
+ result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPC_ACL, args);
}
if (!result.isSuccess()) {
@@ -727,7 +758,7 @@ public class VirtualRoutingResource {
args += pubIP.getPublicIp();
args += " -c ";
args += dev;
- ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_snat.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIP, VRScripts.VPC_SOURCE_NAT, args);
return new Answer(cmd, result.isSuccess(), result.getDetails());
}
@@ -744,7 +775,7 @@ public class VirtualRoutingResource {
args += " -r " + rule.getDstIp();
args += " -d " + rule.getStringDstPortRange().replace(":", "-");
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "vpc_portforwarding.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VPC_PORTFORWARDING, args);
if (!result.isSuccess()) {
results[i++] = "Failed";
@@ -787,7 +818,7 @@ public class VirtualRoutingResource {
args += " -n ";
args += NetUtils.getSubNet(ip.getPublicIp(), ip.getVlanNetmask());
- ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_ipassoc.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIP, VRScripts.VPC_IPASSOC, args);
if (!result.isSuccess()) {
results[i++] = ip.getPublicIp() + " - vpc_ipassoc failed:" + result.getDetails();
break;
@@ -797,7 +828,7 @@ public class VirtualRoutingResource {
snatArgs += " -l " + ip.getPublicIp();
snatArgs += " -c " + nicName;
- result = _vrDeployer.executeInVR(routerIP, "vpc_privateGateway.sh", snatArgs);
+ result = _vrDeployer.executeInVR(routerIP, VRScripts.VPC_PRIVATEGW, snatArgs);
if (result != null) {
results[i++] = ip.getPublicIp() + " - vpc_privateGateway failed:" + result.getDetails();
break;
@@ -821,7 +852,7 @@ public class VirtualRoutingResource {
}
String args = " -a " + sb.toString();
- ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_staticroute.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIP, VRScripts.VPC_STATIC_ROUTE, args);
if (!result.isSuccess()) {
for (int i = 0; i < results.length; i++) {
@@ -873,7 +904,7 @@ public class VirtualRoutingResource {
args += " -n";
}
- ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), "ipassoc.sh", args);
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.IPASSOC, args);
if (result.isSuccess()) {
results[i++] = ip.getPublicIp() + " - success";
} else {
[2/3] git commit: updated refs/heads/master to deb55ac
Posted by ya...@apache.org.
Remove SetupGuestNetworkAnswer
It's unnecessary and not different from Answer itself.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bde675f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bde675f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bde675f
Branch: refs/heads/master
Commit: 6bde675f87111e13ce7d2e036fdf4c67177929c6
Parents: 161e7d9
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Feb 14 17:28:55 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Feb 14 18:10:05 2014 -0800
----------------------------------------------------------------------
.../agent/api/SetupGuestNetworkAnswer.java | 26 ---------------
.../virtualnetwork/VirtualRoutingResource.java | 12 +++----
.../cloud/agent/manager/MockNetworkManager.java | 3 +-
.../agent/manager/MockNetworkManagerImpl.java | 9 +++---
.../VpcVirtualNetworkApplianceManagerImpl.java | 33 +++++++++-----------
5 files changed, 25 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bde675f/core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java b/core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
deleted file mode 100644
index 16eb771..0000000
--- a/core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// 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,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.agent.api;
-
-public class SetupGuestNetworkAnswer extends Answer {
- public SetupGuestNetworkAnswer() {
- }
-
- public SetupGuestNetworkAnswer(SetupGuestNetworkCommand cmd, boolean success, String result) {
- super(cmd, success, result);
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bde675f/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 0b90cc9..a287ada 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -25,7 +25,6 @@ import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.GetDomRVersionAnswer;
import com.cloud.agent.api.GetDomRVersionCmd;
-import com.cloud.agent.api.SetupGuestNetworkAnswer;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.routing.CreateIpAliasCommand;
import com.cloud.agent.api.routing.DeleteIpAliasCommand;
@@ -47,7 +46,6 @@ import com.cloud.agent.api.routing.SetNetworkACLCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesAnswer;
import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand;
-import com.cloud.agent.api.routing.SetSourceNatAnswer;
import com.cloud.agent.api.routing.SetSourceNatCommand;
import com.cloud.agent.api.routing.SetStaticNatRulesAnswer;
import com.cloud.agent.api.routing.SetStaticNatRulesCommand;
@@ -631,7 +629,7 @@ public class VirtualRoutingResource {
return new Answer(cmd);
}
- protected SetupGuestNetworkAnswer execute(SetupGuestNetworkCommand cmd) {
+ protected Answer execute(SetupGuestNetworkCommand cmd) {
NicTO nic = cmd.getNic();
String routerIP = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String routerGIP = cmd.getAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP);
@@ -668,9 +666,9 @@ public class VirtualRoutingResource {
ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_guestnw.sh", args);
if (!result.isSuccess()) {
- return new SetupGuestNetworkAnswer(cmd, false, "Creating guest network failed due to " + result.getDetails());
+ return new Answer(cmd, false, "Creating guest network failed due to " + result.getDetails());
}
- return new SetupGuestNetworkAnswer(cmd, true, "success");
+ return new Answer(cmd, true, "success");
}
private SetNetworkACLAnswer execute(SetNetworkACLCommand cmd) {
@@ -720,7 +718,7 @@ public class VirtualRoutingResource {
}
}
- protected SetSourceNatAnswer execute(SetSourceNatCommand cmd) {
+ protected Answer execute(SetSourceNatCommand cmd) {
String routerIP = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
IpAddressTO pubIP = cmd.getIpAddress();
String dev = "eth" + pubIP.getNicDevId();
@@ -730,7 +728,7 @@ public class VirtualRoutingResource {
args += " -c ";
args += dev;
ExecutionResult result = _vrDeployer.executeInVR(routerIP, "vpc_snat.sh", args);
- return new SetSourceNatAnswer(cmd, result.isSuccess(), result.getDetails());
+ return new Answer(cmd, result.isSuccess(), result.getDetails());
}
private SetPortForwardingRulesAnswer execute(SetPortForwardingRulesVpcCommand cmd) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bde675f/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java
index 554af68..e7a7a95 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManager.java
@@ -25,7 +25,6 @@ import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PlugNicAnswer;
import com.cloud.agent.api.PlugNicCommand;
import com.cloud.agent.api.PvlanSetupCommand;
-import com.cloud.agent.api.SetupGuestNetworkAnswer;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.UnPlugNicAnswer;
import com.cloud.agent.api.UnPlugNicCommand;
@@ -79,7 +78,7 @@ public interface MockNetworkManager extends Manager {
SetPortForwardingRulesAnswer setVpcPortForwards(SetPortForwardingRulesVpcCommand cmd);
- SetupGuestNetworkAnswer setUpGuestNetwork(SetupGuestNetworkCommand cmd);
+ Answer setUpGuestNetwork(SetupGuestNetworkCommand cmd);
SetStaticNatRulesAnswer setVPCStaticNatRules(SetStaticNatRulesCommand cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bde675f/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java
index a4ffd95..c76ef4d 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockNetworkManagerImpl.java
@@ -30,7 +30,6 @@ import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PlugNicAnswer;
import com.cloud.agent.api.PlugNicCommand;
import com.cloud.agent.api.PvlanSetupCommand;
-import com.cloud.agent.api.SetupGuestNetworkAnswer;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.UnPlugNicAnswer;
import com.cloud.agent.api.UnPlugNicCommand;
@@ -203,18 +202,18 @@ public class MockNetworkManagerImpl extends ManagerBase implements MockNetworkMa
}
@Override
- public SetupGuestNetworkAnswer setUpGuestNetwork(SetupGuestNetworkCommand cmd) {
+ public Answer setUpGuestNetwork(SetupGuestNetworkCommand cmd) {
String domrName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
try {
MockVMVO vms = _mockVmDao.findByVmName(domrName);
if (vms == null) {
- return new SetupGuestNetworkAnswer(cmd, false, "Can not find VM " + domrName);
+ return new Answer(cmd, false, "Can not find VM " + domrName);
}
- return new SetupGuestNetworkAnswer(cmd, true, "success");
+ return new Answer(cmd, true, "success");
} catch (Exception e) {
String msg = "Creating guest network failed due to " + e.toString();
s_logger.warn(msg, e);
- return new SetupGuestNetworkAnswer(cmd, false, msg);
+ return new Answer(cmd, false, msg);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bde675f/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 6e4b771..2b798bf 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -16,27 +16,10 @@
// under the License.
package com.cloud.network.router;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PlugNicCommand;
-import com.cloud.agent.api.SetupGuestNetworkAnswer;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.routing.IpAssocVpcCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
@@ -126,6 +109,20 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfile.Param;
import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
@Component
@Local(value = {VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class})
@@ -339,7 +336,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
cmds.addCommand("setupguestnetwork", setupCmd);
sendCommandsToRouter(router, cmds);
- SetupGuestNetworkAnswer setupAnswer = cmds.getAnswer(SetupGuestNetworkAnswer.class);
+ Answer setupAnswer = cmds.getAnswer("setupguestnetwork");
String setup = add ? "set" : "destroy";
if (!(setupAnswer != null && setupAnswer.getResult())) {
s_logger.warn("Unable to " + setup + " guest network on router " + router);