You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/03 23:33:31 UTC
[1/30] git commit: Merge branch 'master' into vpc
Updated Branches:
refs/heads/vpc 6aee5f2ae -> 5a72044dc
Merge branch 'master' into vpc
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5a72044d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a72044d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a72044d
Branch: refs/heads/vpc
Commit: 5a72044dc756b22b69a2c86d69958bda3c129db4
Parents: 237d91d e9a7495
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Aug 3 14:27:10 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Aug 3 14:30:54 2012 -0700
----------------------------------------------------------------------
README.html | 18 +
README.md | 19 +
.../com/cloud/agent/manager/MockAgentManager.java | 4 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 11 +-
.../src/com/cloud/agent/manager/MockVmManager.java | 2 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 4 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 10 +-
.../com/cloud/resource/AgentRoutingResource.java | 5 +-
api/src/com/cloud/storage/Volume.java | 7 +-
configure-info.in | 17 +
.../user-concentrated-pod/.classpath | 18 +
.../user-concentrated-pod/.project | 18 +
.../deployment-planners/user-dispersing/.classpath | 18 +
.../deployment-planners/user-dispersing/.project | 18 +
plugins/file-systems/netapp/.classpath | 18 +
plugins/file-systems/netapp/.project | 18 +
plugins/host-allocators/random/.classpath | 18 +
plugins/host-allocators/random/.project | 18 +
plugins/hypervisors/kvm/.classpath | 18 +
plugins/hypervisors/kvm/.project | 18 +
plugins/hypervisors/kvm/.pydevproject | 18 +
plugins/hypervisors/ovm/.classpath | 18 +
plugins/hypervisors/ovm/.project | 18 +
plugins/hypervisors/vmware/.classpath | 18 +
plugins/hypervisors/vmware/.project | 18 +
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 33 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 33 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 33 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 33 +-
.../com/cloud/network/CiscoNexusVSMDeviceVO.java | 33 +-
.../network/element/CiscoNexusVSMElement.java | 31 +-
.../element/CiscoNexusVSMElementService.java | 33 +-
plugins/hypervisors/xen/.classpath | 18 +
plugins/hypervisors/xen/.project | 18 +
.../elastic-loadbalancer/.classpath | 18 +
.../network-elements/elastic-loadbalancer/.project | 18 +
plugins/network-elements/f5/.classpath | 18 +
plugins/network-elements/f5/.project | 18 +
plugins/network-elements/juniper-srx/.classpath | 18 +
plugins/network-elements/juniper-srx/.project | 18 +
plugins/network-elements/netscaler/.classpath | 18 +
plugins/network-elements/netscaler/.project | 18 +
plugins/network-elements/nicira-nvp/.classpath | 18 +
plugins/network-elements/nicira-nvp/.project | 18 +
.../nicira-nvp/README.NiciraIntegration | 19 +
.../cloud/agent/api/CreateLogicalSwitchAnswer.java | 16 +
.../agent/api/CreateLogicalSwitchCommand.java | 16 +
.../agent/api/CreateLogicalSwitchPortAnswer.java | 16 +
.../agent/api/CreateLogicalSwitchPortCommand.java | 16 +
.../cloud/agent/api/DeleteLogicalSwitchAnswer.java | 16 +
.../agent/api/DeleteLogicalSwitchCommand.java | 16 +
.../agent/api/DeleteLogicalSwitchPortAnswer.java | 16 +
.../agent/api/DeleteLogicalSwitchPortCommand.java | 16 +
.../cloud/agent/api/StartupNiciraNvpCommand.java | 16 +
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 16 +
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 16 +
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 16 +
.../api/commands/ListNiciraNvpDevicesCmd.java | 16 +
.../api/response/NiciraNvpDeviceResponse.java | 16 +
.../src/com/cloud/network/NiciraNvpDeviceVO.java | 16 +
.../com/cloud/network/NiciraNvpNicMappingVO.java | 16 +
.../src/com/cloud/network/dao/NiciraNvpDao.java | 16 +
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 16 +
.../cloud/network/dao/NiciraNvpNicMappingDao.java | 16 +
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 16 +
.../cloud/network/element/NiciraNvpElement.java | 16 +
.../network/element/NiciraNvpElementService.java | 16 +
.../network/guru/NiciraNvpGuestNetworkGuru.java | 16 +
.../src/com/cloud/network/nicira/Attachment.java | 16 +
.../cloud/network/nicira/ControlClusterStatus.java | 16 +
.../com/cloud/network/nicira/LogicalSwitch.java | 16 +
.../cloud/network/nicira/LogicalSwitchPort.java | 16 +
.../src/com/cloud/network/nicira/NiciraNvpApi.java | 16 +
.../network/nicira/NiciraNvpApiException.java | 16 +
.../com/cloud/network/nicira/NiciraNvpList.java | 16 +
.../src/com/cloud/network/nicira/NiciraNvpTag.java | 16 +
.../cloud/network/nicira/TransportZoneBinding.java | 16 +
.../com/cloud/network/nicira/VifAttachment.java | 16 +
.../cloud/network/resource/NiciraNvpResource.java | 16 +
plugins/network-elements/ovs/.classpath | 18 +
plugins/network-elements/ovs/.project | 18 +
.../src/com/cloud/network/element/OvsElement.java | 28 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 28 +-
.../com/cloud/network/ovs/GreTunnelException.java | 28 +-
.../com/cloud/network/ovs/OvsTunnelManager.java | 28 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 28 +-
.../network/ovs/dao/OvsTunnelInterfaceDao.java | 33 +-
.../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java | 33 +-
.../network/ovs/dao/OvsTunnelInterfaceVO.java | 33 +-
.../cloud/network/ovs/dao/OvsTunnelNetworkDao.java | 33 +-
.../network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 33 +-
.../cloud/network/ovs/dao/OvsTunnelNetworkVO.java | 33 +-
plugins/storage-allocators/random/.classpath | 18 +
plugins/storage-allocators/random/.project | 18 +
plugins/user-authenticators/ldap/.classpath | 18 +
plugins/user-authenticators/ldap/.project | 18 +
plugins/user-authenticators/md5/.classpath | 18 +
plugins/user-authenticators/md5/.project | 18 +
plugins/user-authenticators/plain-text/.classpath | 18 +
plugins/user-authenticators/plain-text/.project | 18 +
.../bindir/cloud-grab-dependent-library-versions | 20 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 16 +
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 16 +
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 17 +
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 16 +
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 17 +
.../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 16 +
scripts/.classpath | 18 +
scripts/.project | 18 +
scripts/.pydevproject | 18 +
scripts/network/juniper/access-profile-add.xml | 18 +
scripts/network/juniper/access-profile-getall.xml | 18 +
scripts/network/juniper/access-profile-getone.xml | 18 +
scripts/network/juniper/address-book-entry-add.xml | 20 +-
.../network/juniper/address-book-entry-getall.xml | 20 +-
.../network/juniper/address-book-entry-getone.xml | 20 +-
scripts/network/juniper/address-pool-add.xml | 18 +
scripts/network/juniper/address-pool-getall.xml | 18 +
scripts/network/juniper/address-pool-getone.xml | 18 +
scripts/network/juniper/application-add.xml | 20 +-
scripts/network/juniper/application-getone.xml | 20 +-
scripts/network/juniper/close-configuration.xml | 20 +-
scripts/network/juniper/commit.xml | 20 +-
scripts/network/juniper/dest-nat-pool-add.xml | 20 +-
scripts/network/juniper/dest-nat-pool-getall.xml | 20 +-
scripts/network/juniper/dest-nat-pool-getone.xml | 20 +-
scripts/network/juniper/dest-nat-rule-add.xml | 20 +-
scripts/network/juniper/dest-nat-rule-getall.xml | 20 +-
scripts/network/juniper/dest-nat-rule-getone.xml | 18 +
scripts/network/juniper/dynamic-vpn-client-add.xml | 18 +
.../network/juniper/dynamic-vpn-client-getall.xml | 18 +
.../network/juniper/dynamic-vpn-client-getone.xml | 18 +
scripts/network/juniper/filter-getone.xml | 18 +
scripts/network/juniper/filter-term-getone.xml | 18 +
.../juniper/firewall-filter-bytes-getall.xml | 18 +
.../network/juniper/guest-vlan-filter-term-add.xml | 18 +
scripts/network/juniper/ike-gateway-add.xml | 18 +
scripts/network/juniper/ike-gateway-getall.xml | 20 +-
scripts/network/juniper/ike-gateway-getone.xml | 20 +-
scripts/network/juniper/ike-policy-add.xml | 20 +-
scripts/network/juniper/ike-policy-getall.xml | 20 +-
scripts/network/juniper/ike-policy-getone.xml | 20 +-
scripts/network/juniper/ipsec-vpn-add.xml | 18 +
scripts/network/juniper/ipsec-vpn-getall.xml | 18 +
scripts/network/juniper/ipsec-vpn-getone.xml | 18 +
scripts/network/juniper/login.xml | 20 +-
scripts/network/juniper/open-configuration.xml | 20 +-
scripts/network/juniper/private-interface-add.xml | 18 +
.../network/juniper/private-interface-getall.xml | 20 +-
.../network/juniper/private-interface-getone.xml | 18 +
.../juniper/private-interface-with-filters-add.xml | 18 +
scripts/network/juniper/proxy-arp-add.xml | 20 +-
scripts/network/juniper/proxy-arp-getall.xml | 20 +-
scripts/network/juniper/proxy-arp-getone.xml | 20 +-
.../network/juniper/public-ip-filter-term-add.xml | 18 +
scripts/network/juniper/rollback.xml | 20 +-
scripts/network/juniper/security-policy-add.xml | 18 +
scripts/network/juniper/security-policy-getall.xml | 18 +
scripts/network/juniper/security-policy-getone.xml | 18 +
scripts/network/juniper/security-policy-group.xml | 18 +
scripts/network/juniper/security-policy-rename.xml | 18 +
scripts/network/juniper/src-nat-pool-add.xml | 20 +-
scripts/network/juniper/src-nat-pool-getone.xml | 20 +-
scripts/network/juniper/src-nat-rule-add.xml | 18 +
scripts/network/juniper/src-nat-rule-getall.xml | 18 +
scripts/network/juniper/src-nat-rule-getone.xml | 18 +
scripts/network/juniper/static-nat-rule-add.xml | 18 +
scripts/network/juniper/static-nat-rule-getall.xml | 18 +
scripts/network/juniper/static-nat-rule-getone.xml | 18 +
scripts/network/juniper/test.xml | 18 +
scripts/network/juniper/zone-interface-add.xml | 18 +
scripts/network/juniper/zone-interface-getone.xml | 18 +
server/.classpath | 18 +
server/.project | 18 +
server/conf/log4j-cloud.xml.in | 18 +
server/conf/migration-components.xml | 17 +
server/scripts/vmops-fix-mysql-config | 16 +
server/src/com/cloud/network/PortProfileVO.java | 18 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 1 +
server/test/async-job-component.xml | 18 +
server/test/sync-queue-component.xml | 18 +
setup/.project | 18 +
setup/apidoc/generatecustomcommand.xsl | 18 +
setup/apidoc/generategenericcommand.xsl | 18 +
setup/apidoc/generatetoc.xsl | 18 +
setup/apidoc/generatetoc_header.xsl | 18 +
setup/apidoc/includes/main.css | 19 +
setup/db/server-setup.xml | 17 +
test/.classpath | 18 +
test/.project | 18 +
test/conf/config.xml | 19 +-
test/conf/deploy.properties | 17 +
test/conf/deploy.xml | 18 +
test/conf/log4j-stdout.properties | 19 +-
test/conf/log4j.properties | 17 +
test/conf/tool.properties | 19 +-
test/metadata/adapter.xml | 18 +
.../delegatedAdmin/delegated_admin_cleanup.xml | 20 +-
.../delegatedAdmin/delegated_admin_createusers.xml | 20 +-
.../delegated_admin_verify_part1.xml | 20 +-
.../delegated_admin_verify_part2.xml | 20 +-
.../pickuser_domainlevel1_domainlevel2.xml | 20 +-
...ickuser_domainlevel1admin_domainlevel1admin.xml | 20 +-
.../pickuser_domainlevel1admin_rootadmin.xml | 20 +-
.../pickuser_domainlevel2_child_domainlevel1.xml | 20 +-
...pickuser_domainlevel2_nonchild_domainlevel1.xml | 20 +-
.../pickuser_domainlevel2_rootadmin1.xml | 20 +-
.../pickuser_rootadmin1_rootadmin2.xml | 20 +-
.../pickuser_rootadmin_vs_domainlevel1admin.xml | 20 +-
test/metadata/func/commands | 19 +-
test/metadata/func/directnw_regression.xml | 20 +-
test/metadata/func/error_events.properties | 19 +-
test/metadata/func/expunge.xml | 20 +-
test/metadata/func/external_firewall.xml | 20 +-
test/metadata/func/flatnetwork.xml | 20 +-
test/metadata/func/ha.xml | 20 +-
test/metadata/func/iso.xml | 20 +-
test/metadata/func/loadbalancers.xml | 20 +-
test/metadata/func/localstorage_volume_test.xml | 20 +-
test/metadata/func/mgmtvmsync.xml | 20 +-
test/metadata/func/portforwarding.xml | 20 +-
test/metadata/func/private_templates.xml | 20 +-
test/metadata/func/regression.xml | 20 +-
test/metadata/func/regression_events.properties | 19 +-
test/metadata/func/regression_new.xml | 20 +-
test/metadata/func/regression_test.xml | 18 +
test/metadata/func/regression_user.xml | 20 +-
test/metadata/func/regression_works.xml | 18 +
test/metadata/func/resource_limits.xml | 20 +-
test/metadata/func/roughflatstress.xml | 20 +-
test/metadata/func/roughregression.xml | 18 +
test/metadata/func/sanity.xml | 20 +-
test/metadata/func/securitygroups.xml | 20 +-
test/metadata/func/sharedstorage_volume_test.xml | 20 +-
test/metadata/func/snapshot_iso.xml | 20 +-
test/metadata/func/snapshots.xml | 18 +
test/metadata/func/snapshots_contd.xml | 20 +-
test/metadata/func/srxstresswithportfwd.xml | 18 +
test/metadata/func/static_nat.xml | 20 +-
test/metadata/func/templatedwnldstress.xml | 20 +-
test/metadata/func/templates_sync.xml | 18 +
test/metadata/func/userapi.xml | 20 +-
test/metadata/func/vmapi.xml | 20 +-
test/metadata/func/vmsync.xml | 20 +-
test/scripts/run.bat | 19 +-
test/scripts/usercloud.properties | 19 +-
tools/.classpath | 18 +
tools/.project | 18 +
tools/devcloud/basebuild/Vagrantfile | 2 +-
.../basebuild/puppet-devcloudinitial/Modulefile | 2 +-
.../basebuild/puppet-devcloudinitial/files/grub | 18 +
.../puppet-devcloudinitial/files/interfaces | 17 +
.../puppet-devcloudinitial/files/network.conf | 17 +
.../puppet-devcloudinitial/files/xen-defaults | 17 +
.../basebuild/puppet-devcloudinitial/files/xend | 17 +
tools/devcloud/build_vagrant_basebox.sh | 38 +-
.../devcloudbox/puppet-devcloud/Modulefile | 2 +-
.../devcloudbox/puppet-devcloud/files/exports | 17 +
.../puppet-devcloud/files/iptables.save | 21 +-
.../devcloudbox/puppet-devcloud/manifests/init.pp | 2 +
tools/migration/10to21Upgrade.txt | 17 +
tools/migration/upgrade.properties | 17 +
tools/vhd-tools/Makefile | 16 -
tools/vhd-tools/README | 321 --
tools/vhd-tools/include/Makefile | 14 -
tools/vhd-tools/include/atomicio.h | 33 -
tools/vhd-tools/include/blk_uuid.h | 130 -
tools/vhd-tools/include/blktaplib.h | 250 --
tools/vhd-tools/include/libvhd-journal.h | 68 -
tools/vhd-tools/include/libvhd.h | 326 --
tools/vhd-tools/include/list.h | 124 -
tools/vhd-tools/include/lvm-util.h | 71 -
tools/vhd-tools/include/relative-path.h | 43 -
tools/vhd-tools/include/tapdisk-message.h | 141 -
tools/vhd-tools/include/vhd-util.h | 44 -
tools/vhd-tools/include/vhd.h | 219 -
tools/vhd-tools/lvm/Makefile | 38 -
tools/vhd-tools/lvm/lvm-util.c | 349 --
tools/vhd-tools/vhd/Makefile | 56 -
tools/vhd-tools/vhd/lib/Makefile | 75 -
tools/vhd-tools/vhd/lib/atomicio.c | 61 -
tools/vhd-tools/vhd/lib/libvhd-journal.c | 1534 -------
tools/vhd-tools/vhd/lib/libvhd.c | 3352 ---------------
tools/vhd-tools/vhd/lib/relative-path.c | 299 --
tools/vhd-tools/vhd/lib/vhd-util-check.c | 980 -----
tools/vhd-tools/vhd/lib/vhd-util-coalesce.c | 227 -
tools/vhd-tools/vhd/lib/vhd-util-create.c | 80 -
tools/vhd-tools/vhd/lib/vhd-util-fill.c | 105 -
tools/vhd-tools/vhd/lib/vhd-util-modify.c | 132 -
tools/vhd-tools/vhd/lib/vhd-util-query.c | 159 -
tools/vhd-tools/vhd/lib/vhd-util-read.c | 742 ----
tools/vhd-tools/vhd/lib/vhd-util-repair.c | 84 -
tools/vhd-tools/vhd/lib/vhd-util-resize.c | 1131 -----
tools/vhd-tools/vhd/lib/vhd-util-revert.c | 106 -
tools/vhd-tools/vhd/lib/vhd-util-scan.c | 1317 ------
tools/vhd-tools/vhd/lib/vhd-util-set-field.c | 106 -
tools/vhd-tools/vhd/lib/vhd-util-snapshot.c | 216 -
tools/vhd-tools/vhd/vhd-update.c | 259 --
tools/vhd-tools/vhd/vhd-util.c | 160 -
ui/.classpath | 18 +
ui/.project | 18 +
ui/css/cloudstack3-ie7.css | 19 +
ui/css/cloudstack3.css | 18 +
ui/css/cloudstack3.ja.css | 18 +
ui/index.jsp | 18 +
ui/tests/index.html | 18 +
usage/.classpath | 18 +
usage/.project | 18 +
usage/conf/log4j-cloud_usage.xml.in | 18 +
usage/conf/usage-components.xml.in | 18 +
.../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 16 +
.../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 16 +
.../opensuse/SYSCONFDIR/init.d/cloud-usage.in | 16 +
.../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 16 +
usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in | 16 +
.../distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in | 16 +
utils/.classpath | 18 +
utils/.project | 18 +
utils/conf/db.properties | 18 +
utils/conf/log4j-vmops.xml | 18 +
utils/src/com/cloud/utils/ssh/SshHelper.java | 4 +-
utils/test/resources/log4j.xml | 18 +
version-info.in | 19 +
vmware-base/.classpath | 18 +
vmware-base/.project | 18 +
waf.bat | 18 +-
wscript | 17 +
wscript_build | 16 +
wscript_configure | 17 +
329 files changed, 4964 insertions(+), 13783 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a72044d/server/src/com/cloud/network/PortProfileVO.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/PortProfileVO.java
index 6e444a9,6e444a9..c9b2a3f
--- a/server/src/com/cloud/network/PortProfileVO.java
+++ b/server/src/com/cloud/network/PortProfileVO.java
@@@ -14,23 -14,23 +14,7 @@@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
--/**
-- * Copyright (C) 2011 Citrix Systems, Inc. All rights reserved.
-- *
-- * This software is licensed under the GNU General Public License v3 or later.
-- *
-- * It is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-- *
-- */
++
package com.cloud.network;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a72044d/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/storage/StorageManagerImpl.java
index 77da61f,c7dda00..0e9fac7
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@@ -738,7 -740,8 +738,8 @@@ public class StorageManagerImpl impleme
// Find a suitable storage to create volume on
StoragePoolVO destPool = findStoragePool(dskCh, dc, pod, clusterId, vm, avoidPools);
- // Copy the volume from secondary storage to the destination storage pool
+ // Copy the volume from secondary storage to the destination storage pool
+ stateTransitTo(volume, Event.CopyRequested);
VolumeHostVO volumeHostVO = _volumeHostDao.findByVolumeId(volume.getId());
HostVO secStorage = _hostDao.findById(volumeHostVO.getHostId());
String secondaryStorageURL = secStorage.getStorageUrl();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a72044d/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a72044d/ui/index.jsp
----------------------------------------------------------------------