You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/02/07 08:43:59 UTC
[21/50] [abbrv] git commit: refs/heads/gslb - Merge branch 'master'
into regions
Merge branch 'master' into regions
Conflicts:
client/tomcatconf/components.xml.in
server/src/com/cloud/api/ApiResponseHelper.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9ea90c33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9ea90c33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9ea90c33
Branch: refs/heads/gslb
Commit: 9ea90c33595102bacf08cdf2f486e043dc37c298
Parents: a33d8f9 96c2493
Author: Kishan Kavala <ki...@cloud.com>
Authored: Fri Feb 1 11:38:16 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri Feb 1 11:38:16 2013 +0530
----------------------------------------------------------------------
INSTALL.md | 3 +-
.../cloud/agent/api/routing/DhcpEntryCommand.java | 35 +-
api/src/com/cloud/dc/Vlan.java | 5 +
api/src/com/cloud/event/EventCategory.java | 55 ++
api/src/com/cloud/event/EventTypes.java | 351 +++++++++-
api/src/com/cloud/network/Network.java | 90 ++--
api/src/com/cloud/network/NetworkModel.java | 1 +
api/src/com/cloud/network/NetworkProfile.java | 14 +
api/src/com/cloud/network/Networks.java | 2 +-
api/src/com/cloud/storage/Snapshot.java | 39 +-
api/src/com/cloud/vm/Nic.java | 6 +
api/src/com/cloud/vm/NicProfile.java | 42 +-
api/src/com/cloud/vm/UserVmService.java | 14 +-
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
.../api/command/user/network/CreateNetworkCmd.java | 46 ++-
.../api/command/user/vm/DeployVMCmd.java | 45 +-
.../cloudstack/api/response/NetworkResponse.java | 14 +
.../cloudstack/api/response/NicResponse.java | 22 +-
.../cloudstack/api/response/SnapshotResponse.java | 12 +-
.../api/response/VlanIpRangeResponse.java | 33 +
.../com/cloud/bridge/model/CloudStackUserVO.java | 49 ++
.../bridge/persist/dao/CloudStackUserDao.java | 26 +
.../bridge/persist/dao/CloudStackUserDaoImpl.java | 66 ++
.../com/cloud/bridge/service/EC2RestServlet.java | 138 ++--
.../cloud/bridge/service/EC2SoapServiceImpl.java | 4 +-
.../service/core/ec2/EC2AddressFilterSet.java | 17 +-
.../cloud/bridge/service/core/ec2/EC2Engine.java | 164 +++--
.../service/core/ec2/EC2KeyPairFilterSet.java | 6 +-
awsapi/src/com/cloud/stack/CloudStackApi.java | 9 +-
client/pom.xml | 5 +
client/tomcatconf/components.xml.in | 1 +
.../virtualnetwork/VirtualRoutingResource.java | 9 +-
core/src/com/cloud/storage/SnapshotVO.java | 26 +-
framework/events/pom.xml | 47 ++
.../apache/cloudstack/framework/events/Event.java | 94 +++
.../cloudstack/framework/events/EventBus.java | 55 ++
.../framework/events/EventBusException.java | 26 +
.../framework/events/EventSubscriber.java | 30 +
.../cloudstack/framework/events/EventTopic.java | 57 ++
framework/pom.xml | 35 +
patches/systemvm/debian/config/etc/dnsmasq.conf | 278 ++++++--
.../debian/config/etc/init.d/cloud-early-config | 67 ++-
patches/systemvm/debian/config/etc/sysctl.conf | 6 +-
patches/systemvm/debian/config/root/edithosts.sh | 116 +++-
plugins/event-bus/rabbitmq/pom.xml | 46 ++
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 555 +++++++++++++++
.../networkservice/BaremetalDhcpManagerImpl.java | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 19 +-
.../xen/resource/CitrixResourceBase.java | 9 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 4 +-
plugins/pom.xml | 1 +
pom.xml | 2 +
scripts/network/domr/dhcp_entry.sh | 68 +-
server/pom.xml | 5 +
server/src/com/cloud/alert/AlertManagerImpl.java | 64 ++
server/src/com/cloud/api/ApiDBUtils.java | 207 +-----
server/src/com/cloud/api/ApiResponseHelper.java | 216 ++-----
server/src/com/cloud/api/ApiServer.java | 5 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 12 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 30 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 63 +--
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 245 ++++---
.../configuration/DefaultComponentLibrary.java | 4 +
.../configuration/DefaultInterceptorLibrary.java | 8 +-
server/src/com/cloud/dc/VlanVO.java | 43 ++-
.../src/com/cloud/event/ActionEventCallback.java | 135 ----
server/src/com/cloud/event/ActionEventUtils.java | 288 ++++++++
server/src/com/cloud/event/AlertGenerator.java | 87 +++
server/src/com/cloud/event/EventUtils.java | 102 ---
server/src/com/cloud/event/UsageEventUtils.java | 119 +++
.../src/com/cloud/network/Ipv6AddressManager.java | 28 +
.../com/cloud/network/Ipv6AddressManagerImpl.java | 132 ++++
server/src/com/cloud/network/NetworkManager.java | 4 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 322 +++++----
server/src/com/cloud/network/NetworkModelImpl.java | 37 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 233 ++++---
.../com/cloud/network/NetworkStateListener.java | 90 +++
server/src/com/cloud/network/NetworkVO.java | 25 +
server/src/com/cloud/network/UserIpv6Address.java | 52 ++
.../src/com/cloud/network/UserIpv6AddressVO.java | 188 +++++
server/src/com/cloud/network/addr/PublicIp.java | 15 +
server/src/com/cloud/network/dao/NetworkDao.java | 4 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 32 +-
.../com/cloud/network/dao/UserIpv6AddressDao.java | 39 +
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 112 +++
.../network/element/VirtualRouterElement.java | 5 +
.../network/firewall/FirewallManagerImpl.java | 27 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 49 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 9 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 15 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 2 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 11 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 28 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 12 +-
.../network/security/SecurityGroupManagerImpl.java | 78 +--
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 61 +-
.../src/com/cloud/server/ManagementServerImpl.java | 9 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 187 ++----
server/src/com/cloud/storage/dao/SnapshotDao.java | 13 +-
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 49 +-
.../storage/download/DownloadMonitorImpl.java | 76 +--
.../storage/listener/SnapshotStateListener.java | 85 +++
.../storage/listener/VolumeStateListener.java | 85 +++
.../storage/snapshot/SnapshotManagerImpl.java | 195 +++---
.../storage/snapshot/SnapshotSchedulerImpl.java | 6 +-
.../cloud/template/HyervisorTemplateAdapter.java | 29 +-
.../com/cloud/template/TemplateManagerImpl.java | 95 +--
server/src/com/cloud/user/AccountManagerImpl.java | 10 +-
server/src/com/cloud/vm/NicVO.java | 25 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 119 ++--
server/src/com/cloud/vm/UserVmStateListener.java | 88 ++-
.../com/cloud/network/MockNetworkManagerImpl.java | 4 +-
.../com/cloud/network/MockNetworkModelImpl.java | 6 +
.../test/com/cloud/snapshot/SnapshotDaoTest.java | 9 +-
.../com/cloud/user/MockAccountManagerImpl.java | 2 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 9 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 10 +-
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 17 +-
setup/db/create-schema.sql | 34 +-
setup/db/db/schema-40to410.sql | 4 +
tools/whisker/LICENSE | 500 +++++++++++++-
tools/whisker/descriptor-for-packaging.xml | 18 +
ui/scripts/ui-custom/instanceWizard.js | 3 +
utils/pom.xml | 5 +
utils/src/com/cloud/utils/net/NetUtils.java | 114 +++
utils/test/com/cloud/utils/net/NetUtilsTest.java | 35 +-
132 files changed, 5865 insertions(+), 2104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/client/tomcatconf/components.xml.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/components.xml.in
index c45d14e,e9bd56a..e84be04
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@@ -271,7 -271,7 +271,8 @@@ under the License
<dao name="Site2SiteCustomerGatewayDao" class="com.cloud.network.dao.Site2SiteCustomerGatewayDaoImpl" singleton="false"/>
<dao name="Site2SiteVpnGatewayDao" class="com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl" singleton="false"/>
<dao name="Site2SiteVpnConnectionDao" class="com.cloud.network.dao.Site2SiteVpnConnectionDaoImpl" singleton="false"/>
+ <dao name="RegionDao" class="org.apache.cloudstack.region.dao.RegionDaoImpl" singleton="false"/>
+ <dao name="UserIpv6AddressDao" class="com.cloud.network.dao.UserIpv6AddressDaoImpl" singleton="false"/>
</configuration-server>
<awsapi-ec2server class="com.cloud.bridge.service.EC2MainServlet">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiResponseHelper.java
index 96494b8,7b2fe2a..0ae4f0f
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@@ -246,6 -80,21 +81,22 @@@ import com.cloud.vm.InstanceGroup
import com.cloud.vm.NicProfile;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Type;
+ import org.apache.cloudstack.acl.ControlledEntity;
+ import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+ import org.apache.cloudstack.api.ApiConstants.HostDetails;
+ import org.apache.cloudstack.api.ApiConstants.VMDetails;
+ import org.apache.cloudstack.api.BaseCmd;
+ import org.apache.cloudstack.api.ResponseGenerator;
+ import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
+ import org.apache.cloudstack.api.response.*;
++import org.apache.cloudstack.region.Region;
+ import org.apache.log4j.Logger;
+
+ import java.text.DecimalFormat;
+ import java.util.*;
+
+ import static java.util.Collections.emptyList;
+ import static java.util.Collections.singletonList;
public class ApiResponseHelper implements ResponseGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/src/com/cloud/configuration/DefaultComponentLibrary.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/test/com/cloud/user/MockAccountManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/test/com/cloud/vm/MockUserVmManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ea90c33/setup/db/create-schema.sql
----------------------------------------------------------------------