Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 09169E2C8 for ; Fri, 1 Feb 2013 06:32:11 +0000 (UTC) Received: (qmail 59053 invoked by uid 500); 1 Feb 2013 06:32:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 58766 invoked by uid 500); 1 Feb 2013 06:32:04 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 58694 invoked by uid 99); 1 Feb 2013 06:32:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 06:32:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D3D9F828BFD; Fri, 1 Feb 2013 06:32:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [37/40] git commit: refs/heads/master - Merge branch 'master' into regions Message-Id: <20130201063203.D3D9F828BFD@tyr.zones.apache.org> Date: Fri, 1 Feb 2013 06:32:03 +0000 (UTC) Merge branch 'master' into regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c607e03f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c607e03f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c607e03f Branch: refs/heads/master Commit: c607e03f0e79e88f6c2ff9baffabcdd1f55050d6 Parents: e734131 cae89c6 Author: Kishan Kavala Authored: Thu Jan 31 22:31:25 2013 +0530 Committer: Kishan Kavala Committed: Thu Jan 31 22:31:25 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 20 +- api/src/com/cloud/event/EventTypes.java | 12 + api/src/com/cloud/host/Host.java | 2 + api/src/com/cloud/network/Network.java | 8 +- api/src/com/cloud/network/NetworkProfile.java | 4 + .../network/element/UserDataServiceProvider.java | 1 + .../cloud/network/firewall/FirewallService.java | 6 +- api/src/com/cloud/vm/UserVmService.java | 31 + .../org/apache/cloudstack/api/ApiConstants.java | 2 + api/src/org/apache/cloudstack/api/BaseCmd.java | 8 +- .../user/firewall/CreateEgressFirewallRuleCmd.java | 341 ++ .../user/firewall/CreateFirewallRuleCmd.java | 4 +- .../user/firewall/CreatePortForwardingRuleCmd.java | 2 +- .../user/firewall/DeleteEgressFirewallRuleCmd.java | 120 + .../user/firewall/ListEgressFirewallRulesCmd.java | 89 + .../user/firewall/ListFirewallRulesCmd.java | 4 + .../loadbalancer/CreateLoadBalancerRuleCmd.java | 2 +- .../user/nat/CreateIpForwardingRuleCmd.java | 2 +- .../api/command/user/vm/AddNicToVMCmd.java | 121 + .../api/command/user/vm/RemoveNicFromVMCmd.java | 115 + .../api/command/user/vm/ResetVMSSHKeyCmd.java | 151 + .../command/user/vm/UpdateDefaultNicForVMCmd.java | 115 + .../cloudstack/api/response/FirewallResponse.java | 7 + .../cloudstack/api/response/NicResponse.java | 3 + .../WEB-INF/classes/resources/messages.properties | 1 + client/tomcatconf/commands.properties.in | 11 + client/tomcatconf/server-ssl.xml.in | 1 - .../virtualnetwork/VirtualRoutingResource.java | 11 +- docs/en-US/about-security-groups.xml | 7 +- docs/en-US/admin-alerts.xml | 3 +- docs/en-US/hypervisor-host-install-libvirt.xml | 2 +- docs/en-US/security-groups-advanced-zones.xml | 52 + docs/en-US/security-groups.xml | 3 +- docs/en-US/snapshot-throttling.xml | 45 + docs/en-US/using-sshkeys.xml | 7 + docs/en-US/working-with-snapshots.xml | 1 + packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud-usage.rc | 138 + packaging/centos63/cloud.spec | 24 +- .../debian/config/etc/iptables/iptables-router | 4 +- .../debian/config/opt/cloud/bin/ipassoc.sh | 6 +- .../debian/config/root/firewallRule_egress.sh | 171 + .../cloudstack/ratelimit/ApiRateLimitTest.java | 5 +- plugins/hypervisors/baremetal/pom.xml | 37 + .../resources/security_group_agent/cs-sgagent | 67 + .../security_group_agent/__init__.py | 18 + .../security_group_agent/cs_sg_agent.py | 237 + .../security_group_agent/sglib.py | 226 + .../security_group_agent/xmlobject.py | 97 + .../resources/security_group_agent/setup.py | 44 + .../cloud/baremetal/database/BaremetalCmdbDao.java | 25 + .../baremetal/database/BaremetalCmdbDaoImpl.java | 29 + .../cloud/baremetal/database/BaremetalCmdbVO.java | 104 + .../cloud/baremetal/database/BaremetalDhcpDao.java | 25 + .../baremetal/database/BaremetalDhcpDaoImpl.java | 42 + .../cloud/baremetal/database/BaremetalDhcpVO.java | 118 + .../cloud/baremetal/database/BaremetalPxeDao.java | 26 + .../baremetal/database/BaremetalPxeDaoImpl.java | 38 + .../cloud/baremetal/database/BaremetalPxeVO.java | 115 + .../baremetal/manager/AddBaremetalHostCmd.java | 41 + .../baremetal/manager/BareMetalDiscoverer.java | 280 ++ .../com/cloud/baremetal/manager/BareMetalGuru.java | 87 + .../manager/BareMetalTemplateAdapter.java | 217 + .../cloud/baremetal/manager/BaremetalManager.java | 28 + .../baremetal/manager/BaremetalManagerImpl.java | 112 + .../networkservice/AddBaremetalDhcpCmd.java | 149 + .../AddBaremetalKickStartPxeCmd.java | 36 + .../networkservice/AddBaremetalPxeCmd.java | 144 + .../AddBaremetalPxePingServerCmd.java | 80 + .../networkservice/BareMetalPingServiceImpl.java | 300 ++ .../networkservice/BareMetalPxeServiceBase.java | 68 + .../networkservice/BareMetalResourceBase.java | 618 +++ .../networkservice/BaremetaNetworkGuru.java | 173 + .../networkservice/BaremetalDhcpElement.java | 178 + .../networkservice/BaremetalDhcpManager.java | 58 + .../networkservice/BaremetalDhcpManagerImpl.java | 323 ++ .../networkservice/BaremetalDhcpResourceBase.java | 174 + .../networkservice/BaremetalDhcpResponse.java | 71 + .../networkservice/BaremetalDhcpdResource.java | 139 + .../networkservice/BaremetalDnsmasqResource.java | 129 + .../BaremetalKickStartPxeResource.java | 201 + .../BaremetalKickStartServiceImpl.java | 238 + .../networkservice/BaremetalPingPxeResource.java | 260 ++ .../networkservice/BaremetalPxeElement.java | 178 + .../BaremetalPxeKickStartResponse.java | 37 + .../networkservice/BaremetalPxeManager.java | 65 + .../networkservice/BaremetalPxeManagerImpl.java | 242 + .../networkservice/BaremetalPxePingResponse.java | 59 + .../networkservice/BaremetalPxeResourceBase.java | 157 + .../networkservice/BaremetalPxeResponse.java | 71 + .../networkservice/BaremetalPxeService.java | 61 + .../networkservice/BaremetalUserdataElement.java | 175 + .../networkservice/ListBaremetalDhcpCmd.java | 102 + .../ListBaremetalPxePingServersCmd.java | 92 + .../PrepareKickstartPxeServerCommand.java | 74 + .../networkservice/SecurityGroupHttpClient.java | 38 + .../hypervisor/vmware/resource/VmwareResource.java | 27 +- .../xen/resource/CitrixResourceBase.java | 10 +- .../element/JuniperSRXExternalFirewallElement.java | 1 + plugins/pom.xml | 1 + scripts/network/domr/call_firewall.sh | 21 +- server/src/com/cloud/api/ApiResponseHelper.java | 13 +- server/src/com/cloud/api/ApiServlet.java | 14 +- .../cloud/api/response/ApiResponseSerializer.java | 6 +- server/src/com/cloud/configuration/Config.java | 8 +- server/src/com/cloud/network/NetworkManager.java | 4 +- .../src/com/cloud/network/NetworkManagerImpl.java | 87 +- server/src/com/cloud/network/NetworkModelImpl.java | 5 +- .../com/cloud/network/dao/FirewallRulesDao.java | 3 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 22 +- .../network/element/CloudZonesNetworkElement.java | 6 + .../network/element/VirtualRouterElement.java | 22 +- .../network/firewall/FirewallManagerImpl.java | 189 +- .../network/lb/LoadBalancingRulesManagerImpl.java | 7 +- .../router/VirtualNetworkApplianceManager.java | 3 + .../router/VirtualNetworkApplianceManagerImpl.java | 70 +- .../com/cloud/network/rules/FirewallManager.java | 6 +- .../com/cloud/network/rules/FirewallRuleVO.java | 11 +- .../com/cloud/network/rules/RulesManagerImpl.java | 4 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +- .../src/com/cloud/server/ManagementServerImpl.java | 3 +- .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 113 +- server/src/com/cloud/user/DomainManagerImpl.java | 4 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 404 ++- server/src/com/cloud/vm/VirtualMachineManager.java | 9 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 98 +- .../com/cloud/network/MockFirewallManagerImpl.java | 79 +- .../com/cloud/network/MockNetworkManagerImpl.java | 13 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 27 + .../cloud/vm/MockVirtualMachineManagerImpl.java | 9 + .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 15 +- .../vpc/MockVpcVirtualNetworkApplianceManager.java | 5 + test/integration/smoke/test_nic.py | 351 ++ tools/marvin/marvin/integration/lib/base.py | 23 +- tools/whisker/LICENSE | 3537 ++++++++------- tools/whisker/NOTICE | 141 +- tools/whisker/descriptor-for-packaging.xml | 4 +- tools/whisker/descriptor.xml | 4 +- ui/css/cloudstack3.css | 6 +- ui/dictionary.jsp | 1 + ui/scripts/instanceWizard.js | 6 +- ui/scripts/network.js | 4 +- ui/scripts/system.js | 6 +- ui/scripts/ui-custom/instanceWizard.js | 8 +- usage/pom.xml | 68 + 145 files changed, 11746 insertions(+), 2103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/api/src/org/apache/cloudstack/api/ApiConstants.java ---------------------------------------------------------------------- diff --cc api/src/org/apache/cloudstack/api/ApiConstants.java index e787ce2,d242830..9d620ab mode 100644,100755..100755 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/api/src/org/apache/cloudstack/api/BaseCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/server/src/com/cloud/user/DomainManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c607e03f/server/test/com/cloud/vm/MockUserVmManagerImpl.java ----------------------------------------------------------------------