You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/07/17 19:35:49 UTC
[50/50] [abbrv] git commit: updated refs/heads/ldapplugin to 7bc705e
Merge remote-tracking branch 'origin/master' into ldapplugin
Conflicts:
setup/db/db/schema-410to420.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7bc705e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7bc705e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7bc705e9
Branch: refs/heads/ldapplugin
Commit: 7bc705e9e8911c9fffd41b9709877f9986b5b792
Parents: c50d9fe 4bbaac2
Author: Chip Childers <ch...@apache.org>
Authored: Wed Jul 17 13:34:18 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Wed Jul 17 13:34:18 2013 -0400
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 45 --
agent/src/com/cloud/agent/AgentShell.java | 86 ---
agent/src/com/cloud/agent/IAgentShell.java | 2 -
agent/test/com/cloud/agent/TestAgentShell.java | 43 --
api/src/com/cloud/agent/api/to/DhcpTO.java | 64 ++
api/src/com/cloud/agent/api/to/DnsmasqTO.java | 64 --
api/src/com/cloud/agent/api/to/NfsTO.java | 2 +-
api/src/com/cloud/agent/api/to/SwiftTO.java | 12 +-
api/src/com/cloud/event/EventTypes.java | 4 +-
.../com/cloud/hypervisor/HypervisorGuru.java | 9 +-
api/src/com/cloud/network/Network.java | 1 +
api/src/com/cloud/network/NetworkService.java | 3 +
.../network/element/DhcpServiceProvider.java | 2 +-
api/src/com/cloud/offering/NetworkOffering.java | 1 +
api/src/com/cloud/resource/ResourceService.java | 15 -
api/src/com/cloud/server/ManagementService.java | 14 +-
api/src/com/cloud/user/UserContext.java | 140 ----
.../com/cloud/user/UserContextInitializer.java | 40 --
api/src/com/cloud/vm/VirtualMachineName.java | 4 -
.../affinity/AffinityGroupProcessor.java | 13 +
.../affinity/AffinityGroupService.java | 2 +
.../affinity/AffinityProcessorBase.java | 7 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 10 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 12 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 5 +-
.../command/admin/account/CreateAccountCmd.java | 6 +-
.../command/admin/account/DeleteAccountCmd.java | 7 +-
.../admin/account/DisableAccountCmd.java | 5 +-
.../api/command/admin/config/ListCfgsByCmd.java | 14 +-
.../command/admin/domain/CreateDomainCmd.java | 5 +-
.../command/admin/domain/DeleteDomainCmd.java | 5 +-
.../command/admin/domain/UpdateDomainCmd.java | 5 +-
.../admin/host/CancelMaintenanceCmd.java | 5 +-
.../admin/host/PrepareForMaintenanceCmd.java | 5 +-
.../command/admin/host/ReconnectHostCmd.java | 5 +-
.../admin/host/ReleaseHostReservationCmd.java | 5 +-
...ConfigureInternalLoadBalancerElementCmd.java | 7 +-
.../CreateInternalLoadBalancerElementCmd.java | 5 +-
.../admin/internallb/StartInternalLBVMCmd.java | 7 +-
.../admin/internallb/StopInternalLBVMCmd.java | 7 +-
.../network/AddNetworkServiceProviderCmd.java | 5 +-
.../admin/network/CreateNetworkOfferingCmd.java | 7 +
.../admin/network/CreatePhysicalNetworkCmd.java | 5 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 5 +-
.../ReleaseDedicatedGuestVlanRangeCmd.java | 6 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 6 +
.../admin/resource/ArchiveAlertsCmd.java | 24 +-
.../admin/resource/CleanVMReservationsCmd.java | 80 +++
.../command/admin/resource/DeleteAlertsCmd.java | 23 +-
.../ConfigureVirtualRouterElementCmd.java | 5 +-
.../router/CreateVirtualRouterElementCmd.java | 5 +-
.../command/admin/router/DestroyRouterCmd.java | 7 +-
.../command/admin/router/RebootRouterCmd.java | 5 +-
.../command/admin/router/StartRouterCmd.java | 5 +-
.../api/command/admin/router/StopRouterCmd.java | 5 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 5 +-
.../admin/storage/CreateStoragePoolCmd.java | 2 +
.../PreparePrimaryStorageForMaintenanceCmd.java | 5 +-
.../api/command/admin/swift/AddSwiftCmd.java | 118 ----
.../api/command/admin/swift/ListSwiftsCmd.java | 70 --
.../admin/systemvm/DestroySystemVmCmd.java | 7 +-
.../admin/systemvm/MigrateSystemVMCmd.java | 7 +-
.../admin/systemvm/RebootSystemVmCmd.java | 7 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 8 +-
.../admin/systemvm/StartSystemVMCmd.java | 7 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 7 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 7 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 5 +-
.../api/command/admin/user/CreateUserCmd.java | 7 +-
.../api/command/admin/user/DeleteUserCmd.java | 5 +-
.../api/command/admin/user/DisableUserCmd.java | 5 +-
.../api/command/admin/user/EnableUserCmd.java | 5 +-
.../api/command/admin/user/UpdateUserCmd.java | 5 +-
.../api/command/admin/vm/MigrateVMCmd.java | 7 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 5 +-
.../admin/vpc/DeletePrivateGatewayCmd.java | 5 +-
.../api/command/admin/zone/CreateZoneCmd.java | 5 +-
.../api/command/admin/zone/DeleteZoneCmd.java | 5 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 5 +-
.../user/account/AddAccountToProjectCmd.java | 5 +-
.../account/DeleteAccountFromProjectCmd.java | 5 +-
.../user/address/AssociateIPAddrCmd.java | 11 +-
.../user/address/DisassociateIPAddrCmd.java | 5 +-
.../affinitygroup/CreateAffinityGroupCmd.java | 5 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 5 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 5 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 7 +-
.../user/autoscale/CreateConditionCmd.java | 9 +-
.../autoscale/DeleteAutoScalePolicyCmd.java | 5 +-
.../autoscale/DeleteAutoScaleVmGroupCmd.java | 5 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 5 +-
.../autoscale/UpdateAutoScalePolicyCmd.java | 5 +-
.../autoscale/UpdateAutoScaleVmGroupCmd.java | 5 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 5 +-
.../command/user/event/ArchiveEventsCmd.java | 29 +-
.../api/command/user/event/DeleteEventsCmd.java | 26 +-
.../firewall/CreateEgressFirewallRuleCmd.java | 11 +-
.../user/firewall/CreateFirewallRuleCmd.java | 11 +-
.../firewall/CreatePortForwardingRuleCmd.java | 13 +-
.../firewall/DeleteEgressFirewallRuleCmd.java | 5 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 5 +-
.../firewall/DeletePortForwardingRuleCmd.java | 5 +-
.../api/command/user/iso/AttachIsoCmd.java | 5 +-
.../api/command/user/iso/DeleteIsoCmd.java | 5 +-
.../api/command/user/iso/ExtractIsoCmd.java | 5 +-
.../api/command/user/iso/ListIsosCmd.java | 5 +-
.../api/command/user/iso/RegisterIsoCmd.java | 5 +-
.../AssignToLoadBalancerRuleCmd.java | 5 +-
.../CreateApplicationLoadBalancerCmd.java | 5 +-
.../CreateLBHealthCheckPolicyCmd.java | 10 +-
.../CreateLBStickinessPolicyCmd.java | 7 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 11 +-
.../DeleteApplicationLoadBalancerCmd.java | 5 +-
.../DeleteLBHealthCheckPolicyCmd.java | 8 +-
.../DeleteLBStickinessPolicyCmd.java | 7 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 5 +-
.../ListLBHealthCheckPoliciesCmd.java | 3 +-
.../ListLBStickinessPoliciesCmd.java | 5 +-
.../RemoveFromLoadBalancerRuleCmd.java | 5 +-
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 5 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 11 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 5 +-
.../user/network/CreateNetworkACLCmd.java | 8 +-
.../user/network/CreateNetworkACLListCmd.java | 4 +-
.../command/user/network/CreateNetworkCmd.java | 5 +-
.../user/network/DeleteNetworkACLCmd.java | 8 +-
.../user/network/DeleteNetworkACLListCmd.java | 8 +-
.../command/user/network/DeleteNetworkCmd.java | 5 +-
.../user/network/ReplaceNetworkACLListCmd.java | 8 +-
.../user/network/UpdateNetworkACLItemCmd.java | 8 +-
.../command/user/network/UpdateNetworkCmd.java | 5 +-
.../user/project/ActivateProjectCmd.java | 5 +-
.../command/user/project/CreateProjectCmd.java | 11 +-
.../command/user/project/DeleteProjectCmd.java | 5 +-
.../project/DeleteProjectInvitationCmd.java | 5 +-
.../command/user/project/SuspendProjectCmd.java | 5 +-
.../command/user/project/UpdateProjectCmd.java | 5 +-
.../project/UpdateProjectInvitationCmd.java | 5 +-
.../gslb/AssignToGlobalLoadBalancerRuleCmd.java | 7 +-
.../gslb/CreateGlobalLoadBalancerRuleCmd.java | 10 +-
.../gslb/DeleteGlobalLoadBalancerRuleCmd.java | 6 +-
.../RemoveFromGlobalLoadBalancerRuleCmd.java | 7 +-
.../gslb/UpdateGlobalLoadBalancerRuleCmd.java | 2 +-
.../user/resource/UpdateResourceCountCmd.java | 5 +-
.../user/resource/UpdateResourceLimitCmd.java | 5 +-
.../AuthorizeSecurityGroupEgressCmd.java | 5 +-
.../AuthorizeSecurityGroupIngressCmd.java | 5 +-
.../securitygroup/CreateSecurityGroupCmd.java | 5 +-
.../securitygroup/DeleteSecurityGroupCmd.java | 5 +-
.../user/snapshot/CreateSnapshotCmd.java | 5 +-
.../user/snapshot/DeleteSnapshotCmd.java | 5 +-
.../command/user/ssh/CreateSSHKeyPairCmd.java | 5 +-
.../command/user/ssh/DeleteSSHKeyPairCmd.java | 5 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 5 +-
.../command/user/template/CopyTemplateCmd.java | 5 +-
.../user/template/CreateTemplateCmd.java | 6 +-
.../user/template/DeleteTemplateCmd.java | 4 +-
.../user/template/ExtractTemplateCmd.java | 4 +-
.../command/user/template/ListTemplatesCmd.java | 5 +-
.../user/template/RegisterTemplateCmd.java | 5 +-
.../api/command/user/vm/AddIpToVmNicCmd.java | 11 +-
.../api/command/user/vm/AddNicToVMCmd.java | 5 +-
.../api/command/user/vm/DeployVMCmd.java | 11 +-
.../api/command/user/vm/DestroyVMCmd.java | 5 +-
.../api/command/user/vm/ListNicsCmd.java | 8 +-
.../api/command/user/vm/RebootVMCmd.java | 5 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 10 +-
.../api/command/user/vm/RemoveNicFromVMCmd.java | 5 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 5 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 4 +-
.../api/command/user/vm/RestoreVMCmd.java | 5 +-
.../api/command/user/vm/ScaleVMCmd.java | 4 +-
.../api/command/user/vm/StartVMCmd.java | 5 +-
.../api/command/user/vm/StopVMCmd.java | 5 +-
.../user/vm/UpdateDefaultNicForVMCmd.java | 5 +-
.../api/command/user/vm/UpdateVMCmd.java | 5 +-
.../api/command/user/vm/UpgradeVMCmd.java | 5 +-
.../command/user/vmgroup/CreateVMGroupCmd.java | 5 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 4 +-
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 5 +-
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 4 +-
.../user/volume/AddResourceDetailCmd.java | 4 +-
.../command/user/volume/AttachVolumeCmd.java | 5 +-
.../command/user/volume/CreateVolumeCmd.java | 7 +-
.../command/user/volume/DeleteVolumeCmd.java | 7 +-
.../command/user/volume/DetachVolumeCmd.java | 5 +-
.../command/user/volume/ExtractVolumeCmd.java | 5 +-
.../user/volume/RemoveResourceDetailCmd.java | 4 +-
.../command/user/volume/ResizeVolumeCmd.java | 5 +-
.../command/user/volume/UpdateVolumeCmd.java | 5 +-
.../command/user/volume/UploadVolumeCmd.java | 5 +-
.../command/user/vpc/CreateStaticRouteCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 5 +-
.../command/user/vpc/DeleteStaticRouteCmd.java | 5 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 5 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 5 +-
.../user/vpn/DeleteRemoteAccessVpnCmd.java | 5 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 7 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 5 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 5 +-
.../apache/cloudstack/context/CallContext.java | 218 ++++++
.../classes/resources/messages.properties | 4 +-
client/pom.xml | 224 ++++---
client/tomcatconf/applicationContext.xml.in | 8 +-
client/tomcatconf/commands.properties.in | 6 +-
core/src/com/cloud/agent/api/StopCommand.java | 11 -
.../cloud/agent/api/UnregisterNicCommand.java | 55 ++
core/src/com/cloud/agent/api/UpgradeAnswer.java | 26 -
.../src/com/cloud/agent/api/UpgradeCommand.java | 42 --
.../agent/api/routing/DnsMasqConfigCommand.java | 40 +-
.../api/routing/LoadBalancerConfigCommand.java | 4 +-
.../virtualnetwork/VirtualRoutingResource.java | 15 +-
.../com/cloud/network/DnsMasqConfigurator.java | 48 +-
.../com/cloud/network/HAProxyConfigurator.java | 5 +-
.../cloud/storage/template/VmdkProcessor.java | 81 ++-
.../storage/command/DownloadCommand.java | 9 +-
developer/pom.xml | 12 -
docs/en-US/LDAP-for-user-authentication.xml | 42 ++
.../LDAPserver-for-user-authentication.xml | 39 --
docs/en-US/accounts.xml | 6 +-
.../add-password-management-to-templates.xml | 25 +-
docs/en-US/add-remove-nic-ui.xml | 21 +-
docs/en-US/add-remove-nic.xml | 12 +-
docs/en-US/added-API-commands-4-1.xml | 1 -
docs/en-US/added-API-commands-4.2.xml | 335 +++++++++-
docs/en-US/aws-ec2-configuration.xml | 4 +-
docs/en-US/change-database-config.xml | 2 +-
docs/en-US/change-database-password.xml | 10 +-
docs/en-US/citrix-xenserver-installation.xml | 12 +-
docs/en-US/configure-acl.xml | 2 +-
docs/en-US/egress-firewall-rule.xml | 6 +-
.../example-LDAP-configuration-commands.xml | 47 --
.../example-activedirectory-configuration.xml | 43 ++
docs/en-US/example-openldap-configuration.xml | 44 ++
docs/en-US/first_ms_node_install.xml | 4 +-
docs/en-US/hardware-firewall.xml | 1 +
docs/en-US/host-add-xenserver-kvm-ovm.xml | 2 +-
docs/en-US/images/add-ldap-configuration-ad.png | Bin 0 -> 31803 bytes
.../images/add-ldap-configuration-openldap.png | Bin 0 -> 30176 bytes
.../increase-management-server-max-memory.xml | 2 +-
docs/en-US/inter-vlan-routing.xml | 28 +-
docs/en-US/linux-installation.xml | 70 +-
docs/en-US/management-server-install-client.xml | 2 +-
docs/en-US/management-server-install-flow.xml | 28 +-
.../management-server-install-multi-node.xml | 6 +-
.../management-server-install-systemvm.xml | 2 +-
docs/en-US/multiple-ip-nic.xml | 73 ++-
docs/en-US/network-service-providers.xml | 233 ++++---
docs/en-US/password-storage-engine.xml | 68 ++
docs/en-US/query-filter.xml | 60 --
docs/en-US/search-user-bind-dn.xml | 47 --
docs/en-US/vnmc-cisco.xml | 306 +++++++++
docs/en-US/vpc.xml | 6 +
docs/en-US/windows-installation.xml | 9 +-
.../cloudstack/storage/command/CopyCommand.java | 7 +-
.../command/DownloadSystemTemplateCommand.java | 129 ----
.../storage/datastore/db/StoragePoolVO.java | 4 +-
.../cloudstack/context/ServerContexts.java | 66 ++
.../cloud/entity/api/VMEntityManagerImpl.java | 59 +-
.../cloud/entity/api/db/VMComputeTagVO.java | 67 --
.../engine/cloud/entity/api/db/VMEntityVO.java | 577 ----------------
.../cloud/entity/api/db/VMNetworkMapVO.java | 71 --
.../cloud/entity/api/db/VMReservationVO.java | 127 ----
.../cloud/entity/api/db/VMRootDiskTagVO.java | 67 --
.../entity/api/db/VolumeReservationVO.java | 84 ---
.../entity/api/db/dao/VMComputeTagDao.java | 31 -
.../entity/api/db/dao/VMComputeTagDaoImpl.java | 89 ---
.../cloud/entity/api/db/dao/VMEntityDao.java | 41 --
.../entity/api/db/dao/VMEntityDaoImpl.java | 169 -----
.../entity/api/db/dao/VMNetworkMapDao.java | 31 -
.../entity/api/db/dao/VMNetworkMapDaoImpl.java | 85 ---
.../entity/api/db/dao/VMReservationDao.java | 34 -
.../entity/api/db/dao/VMReservationDaoImpl.java | 111 ----
.../entity/api/db/dao/VMRootDiskTagDao.java | 31 -
.../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 88 ---
.../entity/api/db/dao/VolumeReservationDao.java | 31 -
.../api/db/dao/VolumeReservationDaoImpl.java | 68 --
.../src/com/cloud/alert/dao/AlertDao.java | 4 +-
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 37 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +-
.../configuration/dao/ConfigurationDaoImpl.java | 64 +-
.../src/com/cloud/dc/dao/DataCenterDao.java | 2 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 4 +-
.../src/com/cloud/dc/dao/DataCenterVnetDao.java | 4 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 28 +-
.../src/com/cloud/event/dao/EventDao.java | 2 +-
.../src/com/cloud/event/dao/EventDaoImpl.java | 11 +-
.../src/com/cloud/network/dao/IPAddressDao.java | 6 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 33 +-
.../dao/Site2SiteCustomerGatewayDao.java | 2 +-
.../dao/Site2SiteCustomerGatewayDaoImpl.java | 3 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 10 +
.../schema/src/com/cloud/storage/SwiftVO.java | 2 +-
.../com/cloud/storage/VMTemplateSwiftVO.java | 108 ---
.../src/com/cloud/storage/VMTemplateVO.java | 3 +-
.../src/com/cloud/storage/dao/SwiftDao.java | 31 -
.../src/com/cloud/storage/dao/SwiftDaoImpl.java | 58 --
.../cloud/storage/dao/VMTemplateSwiftDao.java | 37 --
.../storage/dao/VMTemplateSwiftDaoImpl.java | 87 ---
.../com/cloud/upgrade/dao/Upgrade410to420.java | 182 +++--
engine/schema/src/com/cloud/vm/dao/NicDao.java | 3 +
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 13 +-
.../src/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +
.../affinity/dao/AffinityGroupVMMapDao.java | 3 +-
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 17 +-
.../cloud/entity/api/db/VMComputeTagVO.java | 67 ++
.../engine/cloud/entity/api/db/VMEntityVO.java | 577 ++++++++++++++++
.../cloud/entity/api/db/VMNetworkMapVO.java | 71 ++
.../cloud/entity/api/db/VMReservationVO.java | 127 ++++
.../cloud/entity/api/db/VMRootDiskTagVO.java | 67 ++
.../entity/api/db/VolumeReservationVO.java | 84 +++
.../entity/api/db/dao/VMComputeTagDao.java | 31 +
.../entity/api/db/dao/VMComputeTagDaoImpl.java | 89 +++
.../cloud/entity/api/db/dao/VMEntityDao.java | 41 ++
.../entity/api/db/dao/VMEntityDaoImpl.java | 169 +++++
.../entity/api/db/dao/VMNetworkMapDao.java | 31 +
.../entity/api/db/dao/VMNetworkMapDaoImpl.java | 85 +++
.../entity/api/db/dao/VMReservationDao.java | 34 +
.../entity/api/db/dao/VMReservationDaoImpl.java | 111 ++++
.../entity/api/db/dao/VMRootDiskTagDao.java | 31 +
.../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 88 +++
.../entity/api/db/dao/VolumeReservationDao.java | 31 +
.../api/db/dao/VolumeReservationDaoImpl.java | 68 ++
.../motion/AncientDataMotionStrategy.java | 19 +-
engine/storage/image/pom.xml | 1 +
.../storage/image/TemplateServiceImpl.java | 5 +-
.../MockLocalNfsSecondaryStorageResource.java | 57 +-
.../storage/test/ChildTestConfiguration.java | 6 -
.../cloudstack/storage/LocalHostEndpoint.java | 24 +-
.../allocator/AbstractStoragePoolAllocator.java | 3 +
.../ClusterScopeStoragePoolAllocator.java | 3 +
.../allocator/LocalStoragePoolAllocator.java | 3 +
.../endpoint/DefaultEndPointSelector.java | 2 +-
.../storage/image/BaseImageStoreDriverImpl.java | 30 +-
.../datastore/PrimaryDataStoreHelper.java | 2 +-
packaging/centos63/cloud.spec | 3 +
.../debian/config/etc/init.d/cloud-early-config | 50 +-
.../debian/config/etc/init.d/cloud-passwd-srvr | 2 +-
.../debian/config/etc/iptables/iptables-router | 1 -
.../debian/config/opt/cloud/bin/ipassoc.sh | 53 +-
.../debian/config/root/createIpAlias.sh | 12 +-
.../debian/config/root/deleteIpAlias.sh | 22 +-
patches/systemvm/debian/config/root/dnsmasq.sh | 13 +-
.../systemvm/debian/config/root/edithosts.sh | 16 +-
patches/systemvm/debian/config/root/func.sh | 64 +-
.../affinity/HostAntiAffinityProcessor.java | 43 ++
.../api/command/user/discovery/ListApisCmd.java | 5 +-
.../admin/ratelimit/ResetApiLimitCmd.java | 5 +-
.../command/user/ratelimit/GetApiLimitCmd.java | 7 +-
.../dedicated/DedicatedResourceManagerImpl.java | 12 +-
.../dedicated/manager/DedicatedApiUnitTest.java | 28 +-
.../implicitplanner/ImplicitPlannerTest.java | 77 ++-
.../cloudstack/api/AddBaremetalDhcpCmd.java | 5 +-
.../cloudstack/api/AddBaremetalPxeCmd.java | 5 +-
.../kvm/resource/BridgeVifDriver.java | 74 ++-
.../kvm/resource/LibvirtComputingResource.java | 98 +--
.../hypervisor/kvm/resource/OvsVifDriver.java | 6 -
.../kvm/storage/LibvirtStorageAdaptor.java | 13 +-
.../src/com/cloud/ucs/manager/UcsCommands.java | 2 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 80 ++-
.../vmware/VmwareDatacenterService.java | 6 +
.../vmware/VmwareServerDiscoverer.java | 70 +-
.../hypervisor/vmware/dao/LegacyZoneDao.java | 4 +-
.../vmware/manager/VmwareHostService.java | 13 +-
.../vmware/manager/VmwareManagerImpl.java | 63 +-
.../vmware/resource/VmwareResource.java | 539 ++++++++++-----
.../VmwareSecondaryStorageResourceHandler.java | 11 +
.../resource/VmwareStorageProcessor.java | 50 +-
.../command/admin/zone/ListVmwareDcsCmd.java | 118 ++++
.../command/admin/zone/RemoveVmwareDcCmd.java | 15 +-
.../api/response/VmwareDatacenterResponse.java | 27 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 30 +-
.../xen/resource/CitrixResourceBase.java | 5 +
.../api/commands/AddBigSwitchVnsDeviceCmd.java | 4 +-
.../commands/DeleteBigSwitchVnsDeviceCmd.java | 4 +-
.../commands/AddCiscoAsa1000vResourceCmd.java | 5 +-
.../api/commands/AddCiscoVnmcResourceCmd.java | 5 +-
.../DeleteCiscoAsa1000vResourceCmd.java | 5 +-
.../commands/DeleteCiscoVnmcResourceCmd.java | 5 +-
.../cloud/network/element/CiscoVnmcElement.java | 7 +-
.../lb/ElasticLoadBalancerManagerImpl.java | 38 +-
.../api/commands/AddF5LoadBalancerCmd.java | 6 +-
.../commands/ConfigureF5LoadBalancerCmd.java | 6 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 6 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 36 +-
.../InternalLBVMManagerTest.java | 9 +-
.../InternalLBVMServiceTest.java | 19 +-
.../cloud/api/commands/AddSrxFirewallCmd.java | 6 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 5 +-
.../api/commands/DeleteSrxFirewallCmd.java | 5 +-
.../commands/AddNetscalerLoadBalancerCmd.java | 6 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 6 +-
.../DeleteNetscalerLoadBalancerCmd.java | 5 +-
.../cloud/network/element/NetscalerElement.java | 5 +
.../api/commands/AddNiciraNvpDeviceCmd.java | 6 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 6 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 6 +-
.../cloudstack/api/commands/AddSspCmd.java | 5 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 5 +-
plugins/pom.xml | 1 -
.../allocator/RandomStoragePoolAllocator.java | 5 +
.../driver/SwiftImageStoreDriverImpl.java | 49 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 7 +-
.../driver/SolidfirePrimaryDataStoreDriver.java | 106 ++-
.../SolidFirePrimaryDataStoreLifeCycle.java | 56 +-
.../storage/datastore/util/SolidFireUtil.java | 4 +
pom.xml | 14 -
scripts/network/domr/call_dnsmasq.sh | 2 -
scripts/storage/qcow2/cleanupmyvms.sh | 83 ---
scripts/storage/qcow2/managesnapshot.sh | 13 +-
.../vm/hypervisor/xenserver/createipAlias.sh | 1 -
.../vm/hypervisor/xenserver/deleteipAlias.sh | 1 -
scripts/vm/hypervisor/xenserver/vmops | 2 +-
scripts/vm/network/security_group.py | 318 ++++-----
server/pom.xml | 4 +-
.../cloud/agent/manager/AgentManagerImpl.java | 38 +-
server/src/com/cloud/api/ApiDBUtils.java | 60 +-
server/src/com/cloud/api/ApiDispatcher.java | 141 ++--
server/src/com/cloud/api/ApiResponseHelper.java | 7 +-
server/src/com/cloud/api/ApiServer.java | 85 +--
server/src/com/cloud/api/ApiServlet.java | 27 +-
.../com/cloud/api/query/QueryManagerImpl.java | 51 +-
.../com/cloud/api/query/ViewResponseHelper.java | 18 +-
.../api/query/dao/DataCenterJoinDaoImpl.java | 7 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 8 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 5 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 13 +
.../com/cloud/async/AsyncJobManagerImpl.java | 176 ++---
.../com/cloud/capacity/CapacityManagerImpl.java | 3 -
server/src/com/cloud/configuration/Config.java | 3 +-
.../configuration/ConfigurationManager.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 280 +++-----
.../consoleproxy/ConsoleProxyManagerImpl.java | 47 +-
.../cloud/deploy/DeploymentPlanningManager.java | 6 +
.../deploy/DeploymentPlanningManagerImpl.java | 104 ++-
.../com/cloud/event/ActionEventInterceptor.java | 21 +-
.../src/com/cloud/event/ActionEventUtils.java | 41 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 28 +-
.../metadata/ResourceMetaDataManagerImpl.java | 5 +-
.../com/cloud/network/NetworkManagerImpl.java | 104 ++-
.../com/cloud/network/NetworkServiceImpl.java | 231 +++----
.../cloud/network/NetworkUsageManagerImpl.java | 3 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 44 +-
.../network/element/VirtualRouterElement.java | 17 +-
.../network/firewall/FirewallManagerImpl.java | 17 +-
.../network/guru/ExternalGuestNetworkGuru.java | 6 +-
.../cloud/network/guru/GuestNetworkGuru.java | 8 +-
.../network/lb/LoadBalancingRulesManager.java | 5 +-
.../lb/LoadBalancingRulesManagerImpl.java | 61 +-
.../VirtualNetworkApplianceManagerImpl.java | 418 ++++++------
.../VpcVirtualNetworkApplianceManagerImpl.java | 151 ++---
.../cloud/network/rules/RulesManagerImpl.java | 43 +-
.../security/SecurityGroupManagerImpl.java | 17 +-
.../network/vpc/NetworkACLManagerImpl.java | 7 +-
.../network/vpc/NetworkACLServiceImpl.java | 19 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 57 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 28 +-
.../network/vpn/Site2SiteVpnManagerImpl.java | 39 +-
.../com/cloud/projects/ProjectManagerImpl.java | 30 +-
.../com/cloud/resource/ResourceManagerImpl.java | 50 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 13 +-
.../cloud/server/ConfigurationServerImpl.java | 2 +-
.../src/com/cloud/server/ManagementServer.java | 2 -
.../com/cloud/server/ManagementServerImpl.java | 136 ++--
.../com/cloud/storage/StorageManagerImpl.java | 34 +-
.../storage/StoragePoolAutomationImpl.java | 11 +-
.../com/cloud/storage/VolumeManagerImpl.java | 44 +-
.../secondary/SecondaryStorageManagerImpl.java | 47 +-
.../storage/snapshot/SnapshotManagerImpl.java | 36 +-
.../com/cloud/storage/swift/SwiftManager.java | 57 --
.../cloud/storage/swift/SwiftManagerImpl.java | 298 ---------
.../cloud/storage/upload/UploadMonitorImpl.java | 27 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 10 +-
.../template/HypervisorTemplateAdapter.java | 3 +-
.../com/cloud/template/TemplateAdapterBase.java | 27 +-
.../com/cloud/template/TemplateManagerImpl.java | 71 +-
.../src/com/cloud/usage/UsageServiceImpl.java | 5 +-
.../src/com/cloud/user/AccountManagerImpl.java | 98 +--
.../src/com/cloud/user/DomainManagerImpl.java | 76 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 202 ++----
server/src/com/cloud/vm/VirtualMachineGuru.java | 36 -
.../com/cloud/vm/VirtualMachineManagerImpl.java | 471 ++++++++-----
.../vm/snapshot/VMSnapshotManagerImpl.java | 7 +-
.../affinity/AffinityGroupServiceImpl.java | 32 +-
.../lb/ApplicationLoadBalancerManagerImpl.java | 9 +-
.../GlobalLoadBalancingRulesServiceImpl.java | 25 +-
.../com/cloud/alert/AlertControlsUnitTest.java | 8 +-
.../test/com/cloud/async/CleanupDelegate.java | 29 -
server/test/com/cloud/async/TestAsync.java | 281 --------
.../com/cloud/async/TestAsyncJobManager.java | 252 -------
.../com/cloud/async/TestSyncQueueManager.java | 208 ------
.../configuration/ConfigurationManagerTest.java | 43 +-
.../com/cloud/event/EventControlsUnitTest.java | 2 +-
.../network/DedicateGuestVlanRangesTest.java | 43 +-
.../cloud/network/MockNetworkManagerImpl.java | 5 +
.../network/UpdatePhysicalNetworkTest.java | 11 +-
...cVirtualNetworkApplianceManagerImplTest.java | 121 ++++
.../cloud/resource/MockResourceManagerImpl.java | 52 +-
.../upgrade/AdvanceZone217To224UpgradeTest.java | 117 ----
.../upgrade/AdvanceZone223To224UpgradeTest.java | 57 --
.../upgrade/BasicZone218To224UpgradeTest.java | 211 ------
.../test/com/cloud/upgrade/DbUpgrade22Test.java | 29 -
.../cloud/upgrade/HostCapacity218to22Test.java | 66 --
.../InstanceGroup218To224UpgradeTest.java | 216 ------
.../PortForwarding218To224UpgradeTest.java | 132 ----
.../upgrade/Sanity220To224UpgradeTest.java | 95 ---
.../upgrade/Sanity222To224UpgradeTest.java | 96 ---
.../upgrade/Sanity223To225UpgradeTest.java | 94 ---
.../upgrade/Sanity224To225UpgradeTest.java | 95 ---
.../upgrade/Template2214To30UpgradeTest.java | 123 ----
.../cloud/upgrade/Test2214To30DBUpgrade.java | 199 ------
.../cloud/upgrade/Usage217To224UpgradeTest.java | 94 ---
.../upgrade/UsageEvents218To224UpgradeTest.java | 91 ---
.../vm/DeploymentPlanningManagerImplTest.java | 6 +
.../com/cloud/vm/MockUserVmManagerImpl.java | 27 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 156 +++--
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../com/cloud/vpc/NetworkACLManagerTest.java | 65 +-
.../com/cloud/vpc/NetworkACLServiceTest.java | 61 +-
server/test/com/cloud/vpc/VpcTest.java | 71 +-
.../affinity/AffinityApiUnitTest.java | 34 +-
.../lb/ApplicationLoadBalancerTest.java | 39 +-
.../networkoffering/ChildTestConfiguration.java | 40 +-
.../CreateNetworkOfferingTest.java | 62 +-
.../cloudstack/region/RegionManagerTest.java | 3 +-
...GlobalLoadBalancingRulesServiceImplTest.java | 114 ++--
server/test/resources/VpcVirtNetAppContext.xml | 41 ++
services/console-proxy/server/js/ajaxkeys.js | 4 +
.../console-proxy/server/scripts/config_ssl.sh | 9 +
services/secondary-storage/pom.xml | 9 +
.../secondary-storage/scripts/config_ssl.sh | 9 +
.../LocalNfsSecondaryStorageResource.java | 73 +--
.../resource/NfsSecondaryStorageResource.java | 326 +++++----
.../LocalNfsSecondaryStorageResourceTest.java | 90 +++
setup/db/db/schema-410to420.sql | 26 +-
setup/dev/s3.cfg | 140 ++++
.../component/test_affinity_groups.py | 4 +-
test/integration/component/test_assign_vm.py | 29 +-
.../component/test_netscaler_configs.py | 180 ++---
test/integration/component/test_netscaler_lb.py | 22 +-
.../component/test_netscaler_lb_algo.py | 2 +-
.../component/test_netscaler_lb_sticky.py | 2 +-
.../component/test_netscaler_nw_off.py | 120 ++--
test/integration/component/test_projects.py | 28 +-
.../component/test_resource_limits.py | 2 +-
.../component/test_vpc_network_lbrules.py | 2 +-
.../smoke/test_non_contigiousvlan.py | 4 +-
.../definitions/systemvmtemplate/postinstall.sh | 1 +
.../systemvmtemplate64/postinstall.sh | 5 +
tools/marvin/marvin/deployDataCenter.py | 7 +-
tools/marvin/marvin/integration/lib/base.py | 7 +-
ui/css/cloudstack3.css | 3 +-
.../vnmcNetworkProvider/vnmcNetworkProvider.js | 372 ++++++++---
ui/modules/vpc/vpc.js | 1 +
ui/scripts/cloudStack.js | 256 ++++----
ui/scripts/configuration.js | 22 +-
ui/scripts/docs.js | 48 ++
ui/scripts/instances.js | 75 +--
ui/scripts/lbStickyPolicy.js | 6 +-
ui/scripts/network.js | 7 +-
ui/scripts/plugins.js | 10 +
ui/scripts/sharedFunctions.js | 512 +++++++++++++++
ui/scripts/system.js | 656 ++++---------------
ui/scripts/templates.js | 15 +-
ui/scripts/ui-custom/instanceWizard.js | 9 +-
ui/scripts/ui-custom/login.js | 3 +
ui/scripts/ui-custom/physicalResources.js | 5 +-
ui/scripts/vm_snapshots.js | 4 +-
ui/scripts/vpc.js | 38 +-
ui/scripts/zoneWizard.js | 10 +-
utils/conf/db.properties | 2 +-
utils/src/com/cloud/utils/SwiftUtil.java | 112 ++++
utils/src/com/cloud/utils/UuidUtils.java | 23 +
.../utils/exception/CloudRuntimeException.java | 21 +-
.../com/cloud/utils/exception/ErrorContext.java | 28 +
utils/src/com/cloud/utils/net/NetUtils.java | 19 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 15 +-
.../vmware/mo/HypervisorHostHelper.java | 97 ++-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 76 ++-
582 files changed, 11507 insertions(+), 11531 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/commands.properties.in
index dce938f,d8d176f..9e14d0f
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@@ -210,8 -210,11 +210,9 @@@ scaleSystemVm=
#### configuration commands
updateConfiguration=1
listConfigurations=1
-ldapConfig=1
-ldapRemove=1
listCapabilities=15
listDeploymentPlanners=1
+ cleanVMReservations=1
#### pod commands
createPod=1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/configuration/Config.java
index d47a2a5,bb0237c..8d8c0c4
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@@ -441,9 -433,9 +442,9 @@@ public enum Config
"routes", ConfigurationParameterScope.zone.toString()),
InternalLbVmServiceOfferingId("Advanced", ManagementServer.class, String.class, "internallbvm.service.offering", null, "Uuid of the service offering used by internal lb vm; if NULL - default system internal lb offering will be used", null),
- ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands", "false", "If set to true, StartCommand, StopCommand, CopyVolumeCommand, CreateCommand will be synchronized on the agent side." +
+ ExecuteInSequence("Advanced", ManagementServer.class, Boolean.class, "execute.in.sequence.hypervisor.commands", "false", "If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the agent side." +
" If set to false, these commands become asynchronous. Default value is false.", null),
- ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." +
+ ExecuteInSequenceNetworkElementCommands("Advanced", NetworkManager.class, Boolean.class, "execute.in.sequence.network.element.commands", "false", "If set to true, DhcpEntryCommand, SavePasswordCommand, UserDataCommand, VmDataCommand will be synchronized on the agent side." +
" If set to false, these commands become asynchronous. Default value is false.", null);
private final String _category;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 8d73102,92178c9..4498006
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@@ -39,8 -39,14 +39,11 @@@ import javax.naming.NamingException
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+ import org.apache.log4j.Logger;
+ import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.acl.SecurityChecker;
-import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
-import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
-import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bc705e9/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index 039afd5,fe1426e..cdb45a1
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -2238,18 -2232,6 +2232,22 @@@ CREATE VIEW `cloud`.`project_view` A
and resource_tags.resource_type = 'Project'
left join
`cloud`.`project_account` pacct ON projects.id = pacct.project_id;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.bind.principal', NULL, 'Specifies the bind principal to use for bind to LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.bind.password', NULL, 'Specifies the password to use for binding to LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.username.attribute', 'uid', 'Sets the username attribute used within LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.email.attribute', 'mail', 'Sets the email attribute used within LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.realname.attribute', 'cn', 'Sets the realname attribute used within LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.user.object', 'inetOrgPerson', 'Sets the object type of users within LDAP');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ldap.basedn', NULL, 'Sets the basedn for LDAP');
+
+CREATE TABLE `cloud`.`ldap_configuration` (
+ `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+ `hostname` varchar(255) NOT NULL COMMENT 'the hostname of the ldap server',
+ `port` int(10) COMMENT 'port that the ldap server is listening on',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
++
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.max.conn', '4096', 'Load Balancer(haproxy) maximum number of concurrent connections(global max)');
+
+ ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)';