Merge branch 'master' into vpc
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/634cd78b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/634cd78b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/634cd78b
Branch: refs/heads/vpc
Commit: 634cd78baa6bdf101aedb47cc871f207fdca3361
Parents: 377b03a 66e14e2
Author: Alena Prokharchyk <[email protected]>
Authored: Thu Jun 28 17:41:40 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Thu Jun 28 17:41:40 2012 -0700
----------------------------------------------------------------------
.../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 9 +-
agent/src/com/cloud/agent/Agent.java | 30 +-
agent/src/com/cloud/agent/AgentShell.java | 1152 ++--
agent/src/com/cloud/agent/IAgentShell.java | 32 +-
.../configuration/AgentComponentLibraryBase.java | 72 +-
.../src/com/cloud/agent/dao/StorageComponent.java | 4 +-
.../cloud/agent/dao/impl/PropertiesStorage.java | 156 +-
.../src/com/cloud/agent/dhcp/DhcpPacketParser.java | 272 -
.../cloud/agent/dhcp/DhcpProtocolParserServer.java | 58 +-
agent/src/com/cloud/agent/dhcp/DhcpSnooper.java | 12 +-
.../src/com/cloud/agent/dhcp/DhcpSnooperImpl.java | 324 --
.../src/com/cloud/agent/dhcp/FakeDhcpSnooper.java | 198 +-
agent/src/com/cloud/agent/mockvm/MockVm.java | 92 +-
agent/src/com/cloud/agent/mockvm/MockVmMgr.java | 582 +-
agent/src/com/cloud/agent/mockvm/VmMgr.java | 50 +-
.../com/cloud/agent/resource/DummyResource.java | 358 +-
.../computing/CloudZonesComputingResource.java | 293 -
.../resource/computing/FakeComputingResource.java | 1064 ++--
.../agent/resource/computing/KVMGuestOsMapper.java | 284 +-
.../cloud/agent/resource/computing/KVMHABase.java | 364 +-
.../agent/resource/computing/KVMHAChecker.java | 98 +-
.../agent/resource/computing/KVMHAMonitor.java | 182 +-
.../resource/computing/LibvirtCapXMLParser.java | 302 +-
.../computing/LibvirtComputingResource.java | 18 +-
.../resource/computing/LibvirtConnection.java | 42 +-
.../resource/computing/LibvirtDomainXMLParser.java | 408 +-
.../resource/computing/LibvirtNetworkDef.java | 338 +-
.../resource/computing/LibvirtStoragePoolDef.java | 120 +-
.../computing/LibvirtStoragePoolXMLParser.java | 154 +-
.../computing/LibvirtStorageVolumeDef.java | 126 +-
.../computing/LibvirtStorageVolumeXMLParser.java | 120 +-
.../agent/resource/computing/LibvirtVMDef.java | 1748 +++---
.../agent/resource/computing/LibvirtXMLParser.java | 66 +-
.../ConsoleProxyAuthenticationResult.java | 96 +-
.../consoleproxy/ConsoleProxyResource.java | 822 ++--
.../com/cloud/agent/storage/KVMPhysicalDisk.java | 96 +-
.../com/cloud/agent/storage/KVMStoragePool.java | 32 +-
.../cloud/agent/storage/KVMStoragePoolManager.java | 126 +-
.../cloud/agent/storage/LibvirtStorageAdaptor.java | 1304 +++---
.../cloud/agent/storage/LibvirtStoragePool.java | 262 +-
.../com/cloud/agent/storage/StorageAdaptor.java | 52 +-
.../com/cloud/agent/vmdata/JettyVmDataServer.java | 602 +-
agent/src/com/cloud/agent/vmdata/VmDataServer.java | 6 +-
agent/test/com/cloud/agent/TestAgentShell.java | 12 +-
api/src/com/cloud/agent/api/StartCommand.java | 15 +-
.../com/cloud/agent/api/to/VirtualMachineTO.java | 9 +
api/src/com/cloud/api/ApiConstants.java | 4 +
api/src/com/cloud/api/BaseCmd.java | 3 +
api/src/com/cloud/api/ResponseGenerator.java | 5 +
api/src/com/cloud/api/commands/AddClusterCmd.java | 11 +-
api/src/com/cloud/api/commands/CreateTagsCmd.java | 131 +
api/src/com/cloud/api/commands/DeleteTagsCmd.java | 112 +
api/src/com/cloud/api/commands/DeployVMCmd.java | 5 +-
.../com/cloud/api/commands/ListNetworksCmd.java | 10 +-
api/src/com/cloud/api/commands/ListTagsCmd.java | 94 +
.../cloud/api/response/F5LoadBalancerResponse.java | 101 -
.../response/NetscalerLoadBalancerResponse.java | 116 -
.../com/cloud/api/response/NetworkResponse.java | 7 +
.../cloud/api/response/ResourceTagResponse.java | 100 +
.../cloud/api/response/SrxFirewallResponse.java | 138 -
api/src/com/cloud/event/EventTypes.java | 5 +
api/src/com/cloud/network/NetworkService.java | 6 +-
api/src/com/cloud/resource/ResourceService.java | 3 +-
api/src/com/cloud/server/ResourceTag.java | 66 +
.../com/cloud/server/TaggedResourceService.java | 57 +
.../com/cloud/bridge/service/EC2RestServlet.java | 46 +-
.../service/core/ec2/EC2SnapshotFilterSet.java | 19 +-
build/build-cloud.xml | 64 +-
build/build-common.xml | 2 +-
build/developer.xml | 8 +-
build/package.xml | 1 +
build/replace.properties | 10 -
client/tomcatconf/commands.properties.in | 8 +-
client/tomcatconf/components.xml.in | 4 +
console-proxy/conf/log4j-cloud.xml | 2 +-
.../xen/resource/CitrixResourceBase.java | 32 +-
.../cloud/network/resource/F5BigIpResource.java | 1081 ----
.../cloud/network/resource/JuniperSrxResource.java | 3204 -----------
.../cloud/network/resource/NetscalerResource.java | 1533 -----
.../storage/template/HttpTemplateDownloader.java | 1 -
debian/control | 2 +-
ovm/.classpath | 15 -
ovm/.project | 23 -
ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py | 171 -
..._reposExceptionDueToWrongReturnValueCheck.patch | 13 -
ovm/scripts/vm/hypervisor/ovm/OvmCommonModule.py | 156 -
ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py | 62 -
ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py | 58 -
.../OvmDontTouchOCFS2ClusterWhenAgentStart.patch | 13 -
ovm/scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 95 -
.../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 102 -
ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py | 304 -
ovm/scripts/vm/hypervisor/ovm/OvmLoggerModule.py | 51 -
ovm/scripts/vm/hypervisor/ovm/OvmNetworkModule.py | 429 --
ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py | 76 -
ovm/scripts/vm/hypervisor/ovm/OvmObjectModule.py | 20 -
ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch | 23 -
.../vm/hypervisor/ovm/OvmSecurityGroupModule.py | 478 --
.../vm/hypervisor/ovm/OvmStoragePoolModule.py | 428 --
ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py | 62 -
ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py | 538 --
ovm/scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 156 -
ovm/scripts/vm/hypervisor/ovm/configureOvm.sh | 127 -
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 287 -
ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java | 122 -
ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 57 -
ovm/src/com/cloud/ovm/hypervisor/OvmHelper.java | 61 -
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 1381 -----
ovm/src/com/cloud/ovm/object/Coder.java | 81 -
ovm/src/com/cloud/ovm/object/Connection.java | 135 -
ovm/src/com/cloud/ovm/object/OvmBridge.java | 66 -
ovm/src/com/cloud/ovm/object/OvmDisk.java | 27 -
ovm/src/com/cloud/ovm/object/OvmHost.java | 89 -
ovm/src/com/cloud/ovm/object/OvmObject.java | 16 -
ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java | 50 -
ovm/src/com/cloud/ovm/object/OvmStoragePool.java | 101 -
ovm/src/com/cloud/ovm/object/OvmVif.java | 26 -
ovm/src/com/cloud/ovm/object/OvmVlan.java | 39 -
ovm/src/com/cloud/ovm/object/OvmVm.java | 108 -
ovm/src/com/cloud/ovm/object/OvmVolume.java | 49 -
ovm/src/com/cloud/ovm/object/Test.java | 179 -
.../user-concentrated-pod/.classpath | 10 +
.../user-concentrated-pod/.project | 17 +
.../user-concentrated-pod/build.xml | 128 +
.../cloud/deploy/UserConcentratedPodPlanner.java | 151 +
.../deployment-planners/user-dispersing/.classpath | 10 +
.../deployment-planners/user-dispersing/.project | 17 +
.../.settings/org.eclipse.jdt.core.prefs | 12 +
.../deployment-planners/user-dispersing/build.xml | 128 +
.../com/cloud/deploy/UserDispersingPlanner.java | 215 +
plugins/host-allocators/random/.classpath | 10 +
plugins/host-allocators/random/.project | 17 +
plugins/host-allocators/random/build.xml | 128 +
.../manager/allocator/impl/RandomAllocator.java | 142 +
plugins/hypervisors/ovm/.classpath | 15 +
plugins/hypervisors/ovm/.project | 23 +
plugins/hypervisors/ovm/build.xml | 136 +
.../ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py | 171 +
..._reposExceptionDueToWrongReturnValueCheck.patch | 13 +
.../scripts/vm/hypervisor/ovm/OvmCommonModule.py | 156 +
.../ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py | 62 +
.../ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py | 58 +
.../OvmDontTouchOCFS2ClusterWhenAgentStart.patch | 13 +
.../scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 95 +
.../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 102 +
.../ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py | 304 +
.../scripts/vm/hypervisor/ovm/OvmLoggerModule.py | 51 +
.../scripts/vm/hypervisor/ovm/OvmNetworkModule.py | 429 ++
.../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py | 76 +
.../scripts/vm/hypervisor/ovm/OvmObjectModule.py | 20 +
.../ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch | 23 +
.../vm/hypervisor/ovm/OvmSecurityGroupModule.py | 478 ++
.../vm/hypervisor/ovm/OvmStoragePoolModule.py | 428 ++
.../ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py | 62 +
.../ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py | 538 ++
.../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 156 +
.../ovm/scripts/vm/hypervisor/ovm/configureOvm.sh | 127 +
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 287 +
.../src/com/cloud/ovm/hypervisor/OvmFencer.java | 122 +
.../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 57 +
.../src/com/cloud/ovm/hypervisor/OvmHelper.java | 61 +
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 1381 +++++
.../ovm/src/com/cloud/ovm/object/Coder.java | 81 +
.../ovm/src/com/cloud/ovm/object/Connection.java | 135 +
.../ovm/src/com/cloud/ovm/object/OvmBridge.java | 66 +
.../ovm/src/com/cloud/ovm/object/OvmDisk.java | 27 +
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 89 +
.../ovm/src/com/cloud/ovm/object/OvmObject.java | 16 +
.../src/com/cloud/ovm/object/OvmSecurityGroup.java | 50 +
.../src/com/cloud/ovm/object/OvmStoragePool.java | 101 +
.../ovm/src/com/cloud/ovm/object/OvmVif.java | 26 +
.../ovm/src/com/cloud/ovm/object/OvmVlan.java | 39 +
.../ovm/src/com/cloud/ovm/object/OvmVm.java | 108 +
.../ovm/src/com/cloud/ovm/object/OvmVolume.java | 49 +
.../ovm/src/com/cloud/ovm/object/Test.java | 179 +
plugins/network-elements/f5/.classpath | 11 +
plugins/network-elements/f5/.project | 17 +
plugins/network-elements/f5/build.xml | 129 +
.../api/commands/AddExternalLoadBalancerCmd.java | 105 +
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 130 +
.../api/commands/ConfigureF5LoadBalancerCmd.java | 109 +
.../commands/DeleteExternalLoadBalancerCmd.java | 83 +
.../api/commands/DeleteF5LoadBalancerCmd.java | 100 +
.../api/commands/ListExternalLoadBalancersCmd.java | 82 +
.../commands/ListF5LoadBalancerNetworksCmd.java | 94 +
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 101 +
.../cloud/api/response/F5LoadBalancerResponse.java | 101 +
.../element/F5ExternalLoadBalancerElement.java | 470 ++
.../F5ExternalLoadBalancerElementService.java | 84 +
.../cloud/network/resource/F5BigIpResource.java | 1081 ++++
plugins/network-elements/juniper-srx/.classpath | 11 +
plugins/network-elements/juniper-srx/.project | 17 +
plugins/network-elements/juniper-srx/build.xml | 129 +
.../cloud/api/commands/AddExternalFirewallCmd.java | 106 +
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 129 +
.../api/commands/ConfigureSrxFirewallCmd.java | 109 +
.../api/commands/DeleteExternalFirewallCmd.java | 82 +
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 99 +
.../api/commands/ListExternalFirewallsCmd.java | 82 +
.../api/commands/ListSrxFirewallNetworksCmd.java | 94 +
.../cloud/api/commands/ListSrxFirewallsCmd.java | 102 +
.../cloud/api/response/SrxFirewallResponse.java | 138 +
.../element/JuniperSRXExternalFirewallElement.java | 546 ++
.../element/JuniperSRXFirewallElementService.java | 83 +
.../cloud/network/resource/JuniperSrxResource.java | 3204 +++++++++++
plugins/network-elements/netscaler/.classpath | 11 +
plugins/network-elements/netscaler/.project | 17 +
plugins/network-elements/netscaler/build.xml | 129 +
.../api/commands/AddNetscalerLoadBalancerCmd.java | 129 +
.../ConfigureNetscalerLoadBalancerCmd.java | 136 +
.../commands/DeleteNetscalerLoadBalancerCmd.java | 100 +
.../ListNetscalerLoadBalancerNetworksCmd.java | 94 +
.../commands/ListNetscalerLoadBalancersCmd.java | 102 +
.../response/NetscalerLoadBalancerResponse.java | 116 +
.../src/com/cloud/network/NetScalerPodVO.java | 61 +
.../src/com/cloud/network/dao/NetScalerPodDao.java | 24 +
.../com/cloud/network/dao/NetScalerPodDaoImpl.java | 57 +
.../cloud/network/element/NetscalerElement.java | 784 +++
.../NetscalerLoadBalancerElementService.java | 69 +
.../cloud/network/resource/NetscalerResource.java | 1533 +++++
plugins/user-authenticators/ldap/.classpath | 10 +
plugins/user-authenticators/ldap/.project | 17 +
.../ldap/LDAPUserAuthenticator.java | 159 +
plugins/user-authenticators/ldap/build.xml | 128 +
scripts/installer/createtmplt.sh | 29 +-
scripts/installer/createvolume.sh | 29 +-
scripts/installer/installcentos.sh | 29 +-
scripts/installer/installdomp.sh | 29 +-
scripts/installer/run_installer.sh | 29 +-
scripts/network/domr/bumpUpPriority.sh | 27 +-
scripts/network/domr/call_firewall.sh | 29 +-
scripts/network/domr/call_loadbalancer.sh | 29 +-
scripts/network/domr/dhcp_entry.sh | 29 +-
scripts/network/domr/router_proxy.sh | 28 +-
scripts/network/domr/save_password_to_domr.sh | 29 +-
scripts/network/domr/vm_data.sh | 29 +-
scripts/network/exdhcp/dhcpd_edithosts.py | 30 +-
scripts/network/exdhcp/dnsmasq_edithosts.sh | 29 +-
scripts/network/exdhcp/prepare_dhcpd.sh | 29 +-
scripts/network/exdhcp/prepare_dnsmasq.sh | 30 +-
scripts/network/ping/prepare_tftp_bootfile.py | 29 +-
scripts/storage/checkchildren.sh | 29 +-
scripts/storage/installIso.sh | 29 +-
scripts/storage/qcow2/cleanupmyvms.sh | 28 +-
scripts/storage/qcow2/create_private_template.sh | 28 +-
scripts/storage/qcow2/createtmplt.sh | 29 +-
scripts/storage/qcow2/createvm.sh | 29 +-
scripts/storage/qcow2/createvolume.sh | 29 +-
scripts/storage/qcow2/delvm.sh | 29 +-
scripts/storage/qcow2/get_domr_kernel.sh | 29 +-
scripts/storage/qcow2/get_iqn.sh | 29 +-
scripts/storage/qcow2/importmpl.sh | 29 +-
scripts/storage/qcow2/listvmdisk.sh | 29 +-
scripts/storage/qcow2/listvmdisksize.sh | 28 +-
scripts/storage/qcow2/listvmtmplt.sh | 28 +-
scripts/storage/qcow2/listvolume.sh | 29 +-
scripts/storage/qcow2/managesnapshot.sh | 28 +-
scripts/storage/qcow2/managevolume.sh | 28 +-
scripts/storage/qcow2/modifyvlan.sh | 29 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 73 +-
scripts/storage/secondary/createtmplt.sh | 28 +-
scripts/storage/secondary/createvolume.sh | 29 +-
scripts/storage/secondary/installIso.sh | 29 +-
scripts/storage/secondary/listvmtmplt.sh | 29 +-
scripts/storage/secondary/listvolume.sh | 30 +-
scripts/util/ipmi.py | 28 +-
scripts/util/macgen.py | 28 +-
scripts/util/prepare_linmin.sh | 29 +-
scripts/util/qemu-ifup | 19 +-
scripts/vm/hypervisor/kvm/kvmheartbeat.sh | 27 +-
scripts/vm/hypervisor/kvm/rundomrpre.sh | 29 +-
scripts/vm/hypervisor/kvm/setup_agent.sh | 27 +-
scripts/vm/hypervisor/versions.sh | 27 +-
scripts/vm/hypervisor/xenserver/check_heartbeat.sh | 27 +-
.../vm/hypervisor/xenserver/cloud-clean-vlan.sh | 26 +-
.../hypervisor/xenserver/cloud-prepare-upgrade.sh | 26 +-
.../hypervisor/xenserver/cloud-propagate-vlan.sh | 26 +-
.../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 26 +-
.../hypervisor/xenserver/cloudstack_pluginlib.py | 19 +-
.../hypervisor/xenserver/cloudstack_plugins.conf | 17 +
.../xenserver/copy_vhd_from_secondarystorage.sh | 26 +-
.../xenserver/copy_vhd_to_secondarystorage.sh | 26 +-
.../create_privatetemplate_from_snapshot.sh | 26 +-
scripts/vm/hypervisor/xenserver/hostvmstats.py | 26 +-
.../vm/hypervisor/xenserver/kill_copy_process.sh | 26 +-
scripts/vm/hypervisor/xenserver/launch_hb.sh | 26 +-
scripts/vm/hypervisor/xenserver/make_migratable.sh | 26 +-
scripts/vm/hypervisor/xenserver/network_info.sh | 26 +-
scripts/vm/hypervisor/xenserver/ovs-vif-flows.py | 19 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 18 +
.../hypervisor/xenserver/setup_heartbeat_file.sh | 26 +-
.../vm/hypervisor/xenserver/setup_heartbeat_sr.sh | 26 +-
scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 26 +-
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 26 +-
scripts/vm/hypervisor/xenserver/swiftxen | 17 +
.../vm/hypervisor/xenserver/upgrade_snapshot.sh | 26 +-
.../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 17 +
scripts/vm/hypervisor/xenserver/vmops | 17 +
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 17 +
scripts/vm/hypervisor/xenserver/vmopspremium | 17 +
scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py | 26 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 17 +
.../hypervisor/xenserver/xen-ovs-vif-flows.rules | 19 +-
scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 26 +-
.../xenserver/xenserver56/InterfaceReconfigure.py | 27 +-
.../vm/hypervisor/xenserver/xenserver56/NFSSR.py | 27 +-
scripts/vm/hypervisor/xenserver/xenserver56/patch | 17 +
.../hypervisor/xenserver/xenserver56fp1/NFSSR.py | 27 +-
.../vm/hypervisor/xenserver/xenserver56fp1/patch | 17 +
.../vm/hypervisor/xenserver/xenserver60/NFSSR.py | 27 +-
scripts/vm/hypervisor/xenserver/xenserver60/patch | 17 +
scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 26 +-
scripts/vm/network/security_group.py | 92 +-
scripts/vm/network/vnet/modifyvlan.sh | 29 +-
scripts/vm/pingtest.sh | 29 +-
scripts/vm/systemvm/injectkeys.sh | 29 +-
.../manager/allocator/impl/RandomAllocator.java | 142 -
server/src/com/cloud/api/ApiDBUtils.java | 15 +-
server/src/com/cloud/api/ApiResponseHelper.java | 41 +-
server/src/com/cloud/api/ApiServer.java | 4 +-
server/src/com/cloud/api/ApiServlet.java | 10 +-
.../cloud/api/commands/AddExternalFirewallCmd.java | 106 -
.../api/commands/AddExternalLoadBalancerCmd.java | 105 -
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 130 -
.../api/commands/AddNetscalerLoadBalancerCmd.java | 129 -
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 129 -
.../api/commands/ConfigureF5LoadBalancerCmd.java | 109 -
.../ConfigureNetscalerLoadBalancerCmd.java | 136 -
.../api/commands/ConfigureSrxFirewallCmd.java | 109 -
.../api/commands/DeleteExternalFirewallCmd.java | 82 -
.../commands/DeleteExternalLoadBalancerCmd.java | 83 -
.../api/commands/DeleteF5LoadBalancerCmd.java | 100 -
.../commands/DeleteNetscalerLoadBalancerCmd.java | 100 -
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 99 -
.../api/commands/ListExternalFirewallsCmd.java | 82 -
.../api/commands/ListExternalLoadBalancersCmd.java | 82 -
.../commands/ListF5LoadBalancerNetworksCmd.java | 94 -
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 101 -
.../ListNetscalerLoadBalancerNetworksCmd.java | 94 -
.../commands/ListNetscalerLoadBalancersCmd.java | 102 -
.../api/commands/ListSrxFirewallNetworksCmd.java | 94 -
.../cloud/api/commands/ListSrxFirewallsCmd.java | 102 -
.../configuration/DefaultComponentLibrary.java | 15 +-
.../cloud/deploy/UserConcentratedPodPlanner.java | 151 -
.../com/cloud/deploy/UserDispersingPlanner.java | 215 -
.../network/ExternalNetworkDeviceManagerImpl.java | 75 -
server/src/com/cloud/network/NetScalerPodVO.java | 61 -
server/src/com/cloud/network/NetworkManager.java | 6 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 92 +-
server/src/com/cloud/network/dao/IPAddressDao.java | 8 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 10 +-
.../src/com/cloud/network/dao/NetScalerPodDao.java | 24 -
.../com/cloud/network/dao/NetScalerPodDaoImpl.java | 57 -
server/src/com/cloud/network/dao/NetworkDao.java | 4 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 29 +-
.../element/F5ExternalLoadBalancerElement.java | 470 --
.../F5ExternalLoadBalancerElementService.java | 84 -
.../element/JuniperSRXExternalFirewallElement.java | 546 --
.../element/JuniperSRXFirewallElementService.java | 83 -
.../cloud/network/element/NetscalerElement.java | 784 ---
.../NetscalerLoadBalancerElementService.java | 69 -
.../com/cloud/resource/ResourceManagerImpl.java | 1704 +++---
.../com/cloud/server/ConfigurationServerImpl.java | 33 +-
.../cloud/server/auth/LDAPUserAuthenticator.java | 159 -
server/src/com/cloud/tags/ResourceTagVO.java | 148 +
.../com/cloud/tags/TaggedResourceManagerImpl.java | 410 ++
server/src/com/cloud/tags/dao/ResourceTagDao.java | 23 +
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 29 +
server/src/com/cloud/user/AccountManager.java | 2 +-
server/src/com/cloud/user/AccountManagerImpl.java | 10 +-
server/src/com/cloud/user/DomainManagerImpl.java | 21 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 26 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 328 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 6 +
.../com/cloud/user/MockAccountManagerImpl.java | 2 +-
setup/apidoc/gen_toc.py | 1 +
setup/db/create-schema.sql | 17 +
setup/db/db/schema-302to303.sql | 3 -
tools/marvin/marvin/configGenerator.py | 16 +-
tools/testClient/.project | 17 -
tools/testClient/.pydevproject | 10 -
tools/testClient/README | 24 -
tools/testClient/TestCaseExecuteEngine.py | 74 -
tools/testClient/asyncJobMgr.py | 230 -
tools/testClient/automated/automated.sh | 60 -
tools/testClient/automated/automated.xml | 4425 ---------------
tools/testClient/cloudstackConnection.py | 174 -
tools/testClient/cloudstackException.py | 36 -
tools/testClient/cloudstackTestCase.py | 53 -
tools/testClient/cloudstackTestClient.py | 153 -
tools/testClient/codegenerator.py | 289 -
tools/testClient/configGenerator.py | 396 --
tools/testClient/dbConnection.py | 92 -
tools/testClient/demo/README | 4 -
tools/testClient/demo/demo.cfg | 25 -
tools/testClient/demo/testDeployVM.py | 98 -
tools/testClient/demo/testSshDeployVM.py | 143 -
tools/testClient/deployAndRun.py | 44 -
tools/testClient/deployDataCenter.py | 395 --
tools/testClient/jsonHelper.py | 192 -
tools/testClient/pymysql/__init__.py | 143 -
tools/testClient/pymysql/charset.py | 186 -
tools/testClient/pymysql/connections.py | 940 ---
tools/testClient/pymysql/constants/CLIENT.py | 32 -
tools/testClient/pymysql/constants/COMMAND.py | 35 -
tools/testClient/pymysql/constants/ER.py | 484 --
tools/testClient/pymysql/constants/FIELD_TYPE.py | 44 -
tools/testClient/pymysql/constants/FLAG.py | 27 -
.../testClient/pymysql/constants/SERVER_STATUS.py | 24 -
tools/testClient/pymysql/constants/__init__.py | 12 -
tools/testClient/pymysql/converters.py | 360 --
tools/testClient/pymysql/cursors.py | 309 -
tools/testClient/pymysql/err.py | 159 -
tools/testClient/pymysql/tests/__init__.py | 25 -
tools/testClient/pymysql/tests/base.py | 32 -
tools/testClient/pymysql/tests/test_DictCursor.py | 68 -
tools/testClient/pymysql/tests/test_basic.py | 205 -
tools/testClient/pymysql/tests/test_example.py | 44 -
tools/testClient/pymysql/tests/test_issues.py | 280 -
.../pymysql/tests/thirdparty/__init__.py | 17 -
.../tests/thirdparty/test_MySQLdb/__init__.py | 19 -
.../tests/thirdparty/test_MySQLdb/capabilities.py | 304 -
.../tests/thirdparty/test_MySQLdb/dbapi20.py | 856 ---
.../test_MySQLdb/test_MySQLdb_capabilities.py | 127 -
.../test_MySQLdb/test_MySQLdb_dbapi20.py | 217 -
.../test_MySQLdb/test_MySQLdb_nonstandard.py | 102 -
tools/testClient/pymysql/times.py | 28 -
tools/testClient/pymysql/util.py | 31 -
tools/testClient/remoteSSHClient.py | 48 -
tools/testClient/resourceMgrTest/__init__.py | 12 -
tools/testClient/resourceMgrTest/setup.py | 85 -
.../resourceMgrTest/testDeploy100Host.py | 106 -
tools/testClient/sandbox/advanced/advanced_env.py | 131 -
tools/testClient/sandbox/advanced/kvm.properties | 37 -
tools/testClient/sandbox/advanced/setup.properties | 36 -
.../sandbox/advanced/tests/test_scenarios.py | 138 -
tools/testClient/sandbox/advanced/xen.properties | 36 -
tools/testClient/sandbox/basic/basic_env.py | 129 -
tools/testClient/sandbox/basic/setup.properties | 34 -
tools/testClient/sandbox/simulator/sandbox.cfg | 138 -
tools/testClient/sandbox/simulator/setup.py | 128 -
.../sandbox/simulator/simulator.properties | 35 -
.../sandbox/simulator/tests/testProvision.py | 131 -
tools/testClient/testcase/test_1.py | 31 -
tools/testClient/testcase/test_2.py | 35 -
tools/testClient/testcase/test_3.py | 122 -
tools/testClient/testcase/test_userDecorator.py | 69 -
tools/testClient/translator.py | 212 -
tools/testClient/unitTest/test_advanced.py | 107 -
tools/testClient/unitTest/test_async.py | 70 -
tools/testClient/unitTest/test_basic_zone.py | 227 -
tools/testClient/unitTest/test_local_storage.py | 255 -
ui/index.jsp | 2 +-
ui/lib/jquery.timers.js | 138 -
ui/scripts/accounts.js | 6 +-
ui/scripts/dashboard.js | 3 +-
ui/scripts/instances.js | 158 +-
ui/scripts/system.js | 126 +-
ui/scripts/templates.js | 49 +-
ui/scripts/ui-custom/physicalResources.js | 7 +-
ui/scripts/ui-custom/zoneWizard.js | 76 +-
ui/scripts/ui/widgets/detailView.js | 13 +-
ui/scripts/zoneWizard.js | 327 +-
utils/src/com/cloud/utils/db/DbUtil.java | 5 +
utils/src/com/cloud/utils/db/GenericDao.java | 5 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 1 +
.../src/com/cloud/hypervisor/vmware/mo/BaseMO.java | 28 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 28 +-
.../hypervisor/vmware/mo/CustomFieldConstants.java | 28 +-
.../vmware/mo/CustomFieldsManagerMO.java | 28 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 28 +-
.../cloud/hypervisor/vmware/mo/DatastoreFile.java | 28 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 28 +-
.../hypervisor/vmware/mo/DiskControllerType.java | 28 +-
.../vmware/mo/HostDatastoreBrowserMO.java | 28 +-
.../vmware/mo/HostDatastoreSystemMO.java | 28 +-
.../hypervisor/vmware/mo/HostFirewallSystemMO.java | 28 +-
.../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 28 +-
.../hypervisor/vmware/mo/HostNetworkSystemMO.java | 28 +-
.../hypervisor/vmware/mo/HostVirtualNicType.java | 28 +-
.../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 28 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 38 +-
.../cloud/hypervisor/vmware/mo/NetworkDetails.java | 28 +-
.../com/cloud/hypervisor/vmware/mo/NetworkMO.java | 28 +-
.../vmware/mo/PerfCounterInfoMapper.java | 28 +-
.../cloud/hypervisor/vmware/mo/PerfManagerMO.java | 28 +-
.../hypervisor/vmware/mo/SnapshotDescriptor.java | 28 +-
.../src/com/cloud/hypervisor/vmware/mo/TaskMO.java | 28 +-
.../hypervisor/vmware/mo/VersioningContants.java | 28 +-
.../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 28 +-
.../vmware/mo/VirtualEthernetCardType.java | 28 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 28 +-
.../hypervisor/vmware/mo/VirtualSwitchType.java | 28 +-
.../hypervisor/vmware/mo/VmdkFileDescriptor.java | 28 +-
.../cloud/hypervisor/vmware/mo/VmwareHostType.java | 28 +-
.../hypervisor/vmware/mo/VmwareHypervisorHost.java | 28 +-
.../mo/VmwareHypervisorHostNetworkSummary.java | 28 +-
.../mo/VmwareHypervisorHostResourceSummary.java | 28 +-
.../hypervisor/vmware/util/VmwareContext.java | 28 +-
.../vmware/util/VmwareGuestOsMapper.java | 28 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 28 +-
wscript | 3 +-
wscript_build | 4 +-
505 files changed, 29753 insertions(+), 41707 deletions(-)
----------------------------------------------------------------------
