Merge branch '4.4' into dev
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3be1113 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3be1113 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3be1113 Branch: refs/heads/4.4 Commit: f3be1113651262c490ffda2ae406dc5d71a3570f Parents: 877c2d2 e33d4a5 Author: Will Stevens <wstev...@cloudops.com> Authored: Mon Jul 28 14:29:17 2014 -0400 Committer: Will Stevens <wstev...@cloudops.com> Committed: Mon Jul 28 14:29:17 2014 -0400 ---------------------------------------------------------------------- README.md | 2 +- .../tomcatconf/commands-simulator.properties.in | 2 + api/src/com/cloud/network/IpAddress.java | 4 +- api/src/com/cloud/network/NetworkModel.java | 4 +- api/src/com/cloud/network/RemoteAccessVpn.java | 4 +- .../cloud/network/Site2SiteVpnConnection.java | 4 +- .../com/cloud/network/Site2SiteVpnGateway.java | 4 +- .../com/cloud/network/as/AutoScaleVmGroup.java | 4 +- .../cloud/network/as/AutoScaleVmProfile.java | 4 +- .../cloud/network/rules/HealthCheckPolicy.java | 7 +- .../cloud/network/rules/StickinessPolicy.java | 7 +- api/src/com/cloud/network/vpc/NetworkACL.java | 4 +- .../com/cloud/network/vpc/NetworkACLItem.java | 4 +- .../cloud/server/ResourceMetaDataService.java | 10 + .../user/address/AssociateIPAddrCmd.java | 9 + .../autoscale/CreateAutoScaleVmGroupCmd.java | 9 + .../autoscale/CreateAutoScaleVmProfileCmd.java | 9 + .../CreateLBHealthCheckPolicyCmd.java | 9 + .../CreateLBStickinessPolicyCmd.java | 9 + .../loadbalancer/CreateLoadBalancerRuleCmd.java | 11 +- .../user/network/CreateNetworkACLCmd.java | 10 + .../user/network/CreateNetworkACLListCmd.java | 11 +- .../user/network/UpdateNetworkACLItemCmd.java | 12 +- .../user/volume/ListResourceDetailsCmd.java | 8 + .../command/user/volume/UploadVolumeCmd.java | 8 + .../user/vpn/CreateRemoteAccessVpnCmd.java | 10 +- .../user/vpn/CreateVpnConnectionCmd.java | 10 + .../command/user/vpn/CreateVpnGatewayCmd.java | 40 +- client/tomcatconf/commands.properties.in | 2 + .../core/spring-core-registry-core-context.xml | 3 + .../com/cloud/agent/manager/AgentAttache.java | 3 - .../cloud/agent/manager/AgentManagerImpl.java | 8 + .../cloud/agent/manager/DirectAgentAttache.java | 107 +- .../orchestration/VolumeOrchestrator.java | 8 +- .../cloud/upgrade/dao/DatabaseAccessObject.java | 45 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 4 +- .../resourcedetail/ResourceDetailsDao.java | 9 + .../resourcedetail/ResourceDetailsDaoBase.java | 20 + .../datastore/provider/DefaultHostListener.java | 2 +- .../utils/crypt/EncryptionSecretKeyChanger.java | 18 +- .../db/src/com/cloud/utils/db/ScriptRunner.java | 74 +- .../com/cloud/utils/db/TransactionLegacy.java | 3 - .../jobs/dao/AsyncJobJoinMapDaoImpl.java | 39 +- .../HypervResource/CloudStackTypes.cs | 8 +- .../HypervResource/HypervResourceController.cs | 3558 ++++---- .../ServerResource/HypervResource/Utils.cs | 4 +- .../ServerResource/HypervResource/WmiCallsV2.cs | 2117 ++++- ....virtualization.v2.Msvm_ShutdownComponent.cs | 1609 ++++ .../WmiWrappers/WmiWrappers.csproj | 7 +- .../kvm/resource/LibvirtComputingResource.java | 4 +- .../spring-simulator-compute-context.xml | 7 +- .../agent/manager/MockStorageManagerImpl.java | 18 +- .../com/cloud/agent/manager/MockVmManager.java | 3 + .../cloud/agent/manager/MockVmManagerImpl.java | 7 + .../cloud/agent/manager/SimulatorManager.java | 10 +- .../agent/manager/SimulatorManagerImpl.java | 429 +- .../api/commands/CleanupSimulatorMockCmd.java | 69 + .../api/commands/ConfigureSimulatorCmd.java | 43 +- .../api/commands/QuerySimulatorMockCmd.java | 78 + .../com/cloud/api/response/MockResponse.java | 107 + .../src/com/cloud/ha/SimulatorFencer.java | 116 + .../src/com/cloud/ha/SimulatorInvestigator.java | 102 + .../cloud/resource/AgentRoutingResource.java | 64 +- .../com/cloud/resource/SimulatorDiscoverer.java | 5 - .../resource/SimulatorSecondaryDiscoverer.java | 3 - .../cloud/simulator/MockConfigurationVO.java | 33 + .../simulator/dao/MockConfigurationDaoImpl.java | 4 +- .../vmware/resource/VmwareResource.java | 146 - .../xen/resource/CitrixResourceBase.java | 1 - .../xen/resource/XenServer56Resource.java | 2 +- .../xen/resource/XenServer620SP1Resource.java | 5 + .../xenserver/XenServerResourceNewBase.java | 2 +- server/src/com/cloud/api/ApiDBUtils.java | 6 +- .../com/cloud/api/query/QueryManagerImpl.java | 25 +- .../cloud/api/query/dao/VolumeJoinDaoImpl.java | 20 +- server/src/com/cloud/configuration/Config.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 12 +- .../deploy/DeploymentPlanningManagerImpl.java | 15 +- .../metadata/ResourceMetaDataManagerImpl.java | 10 + .../src/com/cloud/network/NetworkModelImpl.java | 25 + .../VpcVirtualNetworkApplianceManagerImpl.java | 2 +- .../storage/StoragePoolAutomationImpl.java | 19 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 44 +- .../template/HypervisorTemplateAdapter.java | 16 - server/src/com/cloud/vm/UserVmManagerImpl.java | 7 +- .../com/cloud/network/MockNetworkModelImpl.java | 9 + server/test/com/cloud/vm/UserVmManagerTest.java | 4 + .../com/cloud/vpc/MockNetworkModelImpl.java | 9 + services/console-proxy/plugin/pom.xml | 2 +- services/iam/plugin/pom.xml | 2 +- services/iam/pom.xml | 2 +- services/iam/server/pom.xml | 2 +- setup/db/create-schema-simulator.sql | 5 +- .../redundant_router/check_heartbeat.sh.templ | 15 + .../maint/test_egress_rules_host_maintenance.py | 20 +- .../component/maint/test_high_availability.py | 26 +- .../maint/test_host_high_availability.py | 36 +- .../component/maint/test_multiple_ip_ranges.py | 20 +- .../component/maint/test_redundant_router.py | 70 +- ...test_redundant_router_deployment_planning.py | 17 +- .../test_redundant_router_network_rules.py | 17 +- .../maint/test_vpc_host_maintenance.py | 21 +- .../maint/test_vpc_on_host_maintenance.py | 17 +- .../component/test_VirtualRouter_alerts.py | 22 +- test/integration/component/test_accounts.py | 141 +- .../component/test_add_remove_network.py | 180 +- .../component/test_advancedsg_networks.py | 79 +- .../component/test_affinity_groups.py | 125 +- .../component/test_allocation_states.py | 39 +- test/integration/component/test_asa1000v_fw.py | 18 +- test/integration/component/test_assign_vm.py | 39 +- test/integration/component/test_baremetal.py | 28 +- .../component/test_base_image_updation.py | 37 +- test/integration/component/test_blocker_bugs.py | 119 +- .../component/test_cpu_domain_limits.py | 38 +- test/integration/component/test_cpu_limits.py | 35 +- .../component/test_cpu_max_limits.py | 25 +- .../component/test_cpu_project_limits.py | 20 +- .../component/test_custom_hostname.py | 44 +- .../component/test_deploy_vm_userdata_reg.py | 19 +- .../component/test_dynamic_compute_offering.py | 82 +- .../component/test_egress_fw_rules.py | 24 +- test/integration/component/test_egress_rules.py | 126 +- test/integration/component/test_eip_elb.py | 22 +- test/integration/component/test_escalations.py | 8230 ++++++++++++++++++ .../component/test_explicit_dedication.py | 15 +- test/integration/component/test_haproxy.py | 15 +- .../component/test_implicit_planner.py | 15 +- .../component/test_ip_reservation.py | 109 +- test/integration/component/test_ldap.py | 6 +- .../integration/component/test_memory_limits.py | 32 +- .../component/test_mm_domain_limits.py | 36 +- .../integration/component/test_mm_max_limits.py | 23 +- .../component/test_mm_project_limits.py | 17 +- .../component/test_multiple_ip_ranges.py | 28 +- .../component/test_multiple_ips_per_nic.py | 512 +- .../component/test_netscaler_configs.py | 116 +- test/integration/component/test_netscaler_lb.py | 116 +- .../component/test_netscaler_lb_algo.py | 106 +- .../component/test_netscaler_lb_sticky.py | 17 +- .../component/test_netscaler_nw_off.py | 82 +- .../component/test_network_offering.py | 39 +- .../component/test_non_contiguous_vlan.py | 22 +- .../component/test_persistent_networks.py | 496 +- test/integration/component/test_portable_ip.py | 142 +- .../component/test_project_configs.py | 62 +- .../component/test_project_limits.py | 35 +- .../component/test_project_resources.py | 69 +- .../integration/component/test_project_usage.py | 102 +- test/integration/component/test_projects.py | 110 +- .../component/test_recurring_snapshots.py | 16 +- .../component/test_redundant_router_cleanups.py | 17 +- .../component/test_redundant_router_services.py | 17 +- .../component/test_redundant_router_upgrades.py | 17 +- test/integration/component/test_region_vpc.py | 38 +- test/integration/component/test_regions.py | 12 +- .../component/test_regions_accounts.py | 8 +- .../component/test_reset_ssh_keypair.py | 24 +- .../component/test_resource_limits.py | 33 +- test/integration/component/test_routers.py | 45 +- .../component/test_security_groups.py | 59 +- .../component/test_shared_networks.py | 17 +- test/integration/component/test_snapshot_gc.py | 85 +- .../component/test_snapshot_limits.py | 18 +- test/integration/component/test_snapshots.py | 34 +- .../component/test_snapshots_improvement.py | 26 +- test/integration/component/test_stopped_vm.py | 99 +- .../component/test_storage_motion.py | 15 +- test/integration/component/test_tags.py | 34 +- test/integration/component/test_templates.py | 31 +- test/integration/component/test_update_vm.py | 12 +- test/integration/component/test_usage.py | 85 +- .../component/test_vm_passwdenabled.py | 18 +- test/integration/component/test_vmware_drs.py | 61 +- test/integration/component/test_volumes.py | 62 +- test/integration/component/test_vpc.py | 49 +- .../test_vpc_distributed_routing_offering.py | 35 +- test/integration/component/test_vpc_network.py | 54 +- .../component/test_vpc_network_lbrules.py | 17 +- .../component/test_vpc_network_pfrules.py | 17 +- .../component/test_vpc_network_staticnatrule.py | 17 +- .../integration/component/test_vpc_offerings.py | 17 +- test/integration/component/test_vpc_routers.py | 200 +- .../component/test_vpc_vm_life_cycle.py | 61 +- .../component/test_vpc_vms_deployment.py | 17 +- test/integration/component/test_vpn_users.py | 23 +- test/integration/smoke/test_affinity_groups.py | 97 +- .../smoke/test_deploy_vgpu_enabled_vm.py | 20 +- test/integration/smoke/test_deploy_vm.py | 293 +- .../smoke/test_deploy_vm_root_resize.py | 29 +- .../smoke/test_deploy_vm_with_userdata.py | 60 +- ...deploy_vms_with_varied_deploymentplanners.py | 56 +- test/integration/smoke/test_disk_offerings.py | 46 +- test/integration/smoke/test_global_settings.py | 6 +- test/integration/smoke/test_guest_vlan_range.py | 39 +- test/integration/smoke/test_hosts.py | 109 +- test/integration/smoke/test_internal_lb.py | 79 +- test/integration/smoke/test_iso.py | 138 +- test/integration/smoke/test_loadbalance.py | 126 +- .../smoke/test_multipleips_per_nic.py | 50 +- test/integration/smoke/test_network.py | 243 +- test/integration/smoke/test_network_acl.py | 74 +- test/integration/smoke/test_nic.py | 133 +- .../smoke/test_non_contigiousvlan.py | 37 +- .../integration/smoke/test_over_provisioning.py | 29 +- .../integration/smoke/test_portable_publicip.py | 110 +- test/integration/smoke/test_primary_storage.py | 35 +- test/integration/smoke/test_privategw_acl.py | 31 +- test/integration/smoke/test_public_ip_range.py | 50 +- test/integration/smoke/test_pvlan.py | 26 +- test/integration/smoke/test_regions.py | 35 +- .../smoke/test_reset_vm_on_reboot.py | 86 +- test/integration/smoke/test_resource_detail.py | 95 +- test/integration/smoke/test_routers.py | 136 +- test/integration/smoke/test_scale_vm.py | 102 +- .../integration/smoke/test_secondary_storage.py | 14 +- .../integration/smoke/test_service_offerings.py | 136 +- test/integration/smoke/test_snapshots.py | 137 +- test/integration/smoke/test_ssvm.py | 34 +- test/integration/smoke/test_templates.py | 175 +- test/integration/smoke/test_vm_ha.py | 232 + test/integration/smoke/test_vm_iam.py | 719 ++ test/integration/smoke/test_vm_life_cycle.py | 194 +- test/integration/smoke/test_vm_snapshots.py | 122 +- test/integration/smoke/test_volumes.py | 170 +- test/integration/smoke/test_vpc_vpn.py | 114 +- .../systemvm64template/postinstall.sh | 2 +- .../definitions/systemvmtemplate/postinstall.sh | 2 +- tools/build/setnextversion.sh | 2 +- tools/checkstyle/pom.xml | 2 +- tools/marvin/marvin/__init__.py | 2 +- tools/marvin/marvin/asyncJobMgr.py | 12 +- tools/marvin/marvin/cloudstackConnection.py | 476 +- tools/marvin/marvin/cloudstackException.py | 19 +- tools/marvin/marvin/cloudstackTestCase.py | 6 +- tools/marvin/marvin/cloudstackTestClient.py | 550 +- tools/marvin/marvin/codegenerator.py | 15 +- tools/marvin/marvin/codes.py | 26 +- tools/marvin/marvin/config/__init__.py | 16 + tools/marvin/marvin/config/config.cfg | 38 +- tools/marvin/marvin/config/test_data.cfg | 427 + tools/marvin/marvin/config/test_data.py | 688 ++ tools/marvin/marvin/configGenerator.py | 231 +- tools/marvin/marvin/dbConnection.py | 9 +- tools/marvin/marvin/deployAndRun.py | 6 +- tools/marvin/marvin/deployDataCenter.py | 1531 ++-- tools/marvin/marvin/integration/__init__.py | 18 - tools/marvin/marvin/integration/lib/__init__.py | 16 - tools/marvin/marvin/integration/lib/base.py | 3837 -------- tools/marvin/marvin/integration/lib/common.py | 1036 --- tools/marvin/marvin/integration/lib/utils.py | 453 - tools/marvin/marvin/jsonHelper.py | 9 +- tools/marvin/marvin/lib/__init__.py | 16 + tools/marvin/marvin/lib/base.py | 4137 +++++++++ tools/marvin/marvin/lib/common.py | 1062 +++ tools/marvin/marvin/lib/utils.py | 498 ++ tools/marvin/marvin/marvinInit.py | 250 +- tools/marvin/marvin/marvinLog.py | 141 +- tools/marvin/marvin/marvinPlugin.py | 308 +- tools/marvin/marvin/src/__init__.py | 16 + tools/marvin/marvin/sshClient.py | 142 +- tools/marvin/marvin/tcExecuteEngine.py | 10 +- tools/marvin/marvin/testSetupSuccess.py | 1 + tools/marvin/setup.py | 60 +- ui/css/cloudstack3.css | 4 + ui/dictionary.jsp | 1 + ui/scripts/accounts.js | 25 +- ui/scripts/accountsWizard.js | 5 + ui/scripts/cloudStack.js | 2 +- ui/scripts/configuration.js | 76 +- ui/scripts/instances.js | 6 +- ui/scripts/network.js | 5 + ui/scripts/sharedFunctions.js | 30 +- ui/scripts/storage.js | 34 +- ui/scripts/system.js | 28 +- ui/scripts/templates.js | 970 ++- ui/scripts/ui-custom/accountsWizard.js | 95 +- ui/scripts/ui-custom/physicalResources.js | 2 +- ui/scripts/ui/dialog.js | 7 + utils/src/com/cloud/utils/net/NetUtils.java | 12 +- 280 files changed, 30184 insertions(+), 14441 deletions(-) ----------------------------------------------------------------------
