alena
8a7feb8ec1
Merge branch '2.2.y'
...
Conflicts:
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
api/src/com/cloud/agent/api/to/FirewallRuleTO.java
api/src/com/cloud/agent/api/to/IpAddressTO.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
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/CreateFirewallRuleCmd.java
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
api/src/com/cloud/api/commands/UpdateNetworkCmd.java
api/src/com/cloud/api/response/CapabilitiesResponse.java
api/src/com/cloud/network/Network.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/firewall/FirewallService.java
api/src/com/cloud/network/lb/LoadBalancingRule.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
api/src/com/cloud/network/rules/FirewallRule.java
api/src/com/cloud/network/rules/RulesService.java
api/src/com/cloud/offering/NetworkOffering.java
client/tomcatconf/commands.properties.in
cloud.spec
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
core/src/com/cloud/storage/template/DownloadManagerImpl.java
core/src/com/cloud/vm/DomainRouterVO.java
debian/cloud-deps.install
patches/systemvm/debian/config/etc/init.d/cloud-early-config
patches/systemvm/debian/config/root/ipassoc.sh
patches/systemvm/debian/config/root/loadbalancer.sh
scripts/vm/hypervisor/kvm/rundomrpre.sh
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/agent/manager/AgentAttache.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/agent/manager/AgentMonitor.java
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
server/src/com/cloud/alert/ClusterAlertAdapter.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/cluster/ClusterManagerImpl.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/network/LoadBalancerVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDao.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/element/DhcpElement.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/FirewallManager.java
server/src/com/cloud/network/rules/FirewallRuleVO.java
server/src/com/cloud/network/rules/PortForwardingRuleVO.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/rules/StaticNatRuleImpl.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/server/ConfigurationServerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
server/src/com/cloud/user/AccountManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDao.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/create-index-fk.sql
setup/db/create-schema.sql
setup/db/db/schema-222to224.sql
setup/db/db/schema-227to228.sql
setup/db/db/schema-228to229.sql
setup/db/db/schema-229to2210.sql
tools/testClient/README
ui/scripts/cloud.core.instance.js
utils/src/com/cloud/utils/SerialVersionUID.java
utils/src/com/cloud/utils/db/ConnectionConcierge.java
utils/src/com/cloud/utils/db/Merovingian2.java
utils/src/com/cloud/utils/db/Transaction.java
utils/src/com/cloud/utils/nio/Link.java
utils/src/com/cloud/utils/nio/NioConnection.java
utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
Jessica Wang
24edb0071d
cloudStack - merge UI change from 2.2.10 branch to master branch.
2011-08-22 14:09:59 -07:00
Jessica Wang
eb18d6dd55
bug 10977: cloudStack - instance page - provide "Migrate Instance" action to all hypervisors.
2011-08-15 10:18:43 -07:00
Jessica Wang
2ef10a5993
bug 10977: cloudStack - instance page - limit "Migrate Instance" action to be only available for XenServer and VMware (because KVM does not support Migrate Instance).
2011-08-11 16:51:54 -07:00
Jessica Wang
6d9faceaa2
bug 10977: cloudStack - instance page - provide "Migrate Instance" action to all hypervisors.
2011-08-11 16:31:26 -07:00
Jessica Wang
0c1d89b357
bug 10843: cloudStack - Instance page - statistics tab - show "N/A" when NetworkRead/NetworkWrite is null or equal to zero.
2011-08-11 16:30:56 -07:00
Jessica Wang
4ab76f3021
bug 10843: cloudStack - Instance page - statistics tab - show "N/A" when NetworkRead/NetworkWrite is equal to zero. (2)
2011-08-11 16:12:43 -07:00
Jessica Wang
e750ae728d
cloudStack - sync UI change from 2.2.10 branch to 2.2.y branch.
2011-08-11 15:58:38 -07:00
frank
b0b3f16dae
Two things:
...
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI
2011-07-29 11:28:09 -07:00
frank
055ec48ae8
Two things:
...
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI
2011-07-29 11:25:35 -07:00
Jessica Wang
b06896c831
bug 10631: cloudStack - Instance page - Create Template from VM - add Image Directory input field.
2011-07-27 11:54:57 -07:00
Jessica Wang
609679db2b
bug 10631: cloudStack - Instance page - details tab - add new action "Create Template" when hypervisor is BareMetal.
2011-07-27 11:38:39 -07:00
Jessica Wang
2a8613cdff
bug 10631: cloudStack - Instance page - details tab - add hypervisor gridrow.
2011-07-27 11:38:00 -07:00
Jessica Wang
105edff968
bug 10631: cloudStack - Instance page - Create Template from VM - add Image Directory input field.
2011-07-27 11:31:06 -07:00
Jessica Wang
2b3c8fa120
bug 10631: cloudStack - Instance page - details tab - add new action "Create Template" when hypervisor is BareMetal.
2011-07-27 10:45:01 -07:00
Jessica Wang
8e54d17bd5
bug 10631: cloudStack - Instance page - details tab - add hypervisor gridrow.
2011-07-26 17:12:53 -07:00
Jessica Wang
0800b6423b
cloudStack - snapshot page - populate volume name first, then snapshot state.
2011-07-20 11:42:10 -07:00
Jessica Wang
047e4c63a0
bug 9101: cloudStack UI - Edit Instance - fix a bug that HAEnabled dropdown was empty.
2011-07-19 16:46:56 -07:00
Jessica Wang
a2b4320393
bug 9265: cloudStack UI - middle menu - set maximum length for first row text and second row text.
2011-07-19 16:44:36 -07:00
Jessica Wang
d3a05d0158
cloudStack UI - instance page - remove vmGroup submenu since it keeps confusing users.
2011-07-19 16:36:03 -07:00
Jessica Wang
140d872259
cloudStack - UserVM page - Stop VM action - add option "Force Stop".
2011-07-11 15:50:47 -07:00
Jessica Wang
32f2ec4222
bug 9101: cloudStack UI - Edit Instance - fix a bug that HAEnabled dropdown was empty.
2011-06-16 12:27:25 -07:00
Jessica Wang
0fefd9f2ae
bug 9265: cloudStack UI - middle menu - set maximum length for first row text and second row text.
2011-06-15 14:55:35 -07:00
Jessica Wang
0611c92cad
cloudStack UI - Instance page - Stop Instance - show "Force Stop Instance" option for root-admin.
2011-06-13 16:54:54 -07:00
Jessica Wang
f904493ed9
cloudStack UI - instance page - remove vmGroup submenu since it keeps confusing users.
2011-06-13 11:08:35 -07:00
Jessica Wang
b455b14d8b
bug 9903: cloudStack UI - VM Wizard - security groups selection - exclude default security group since it's always applied.
2011-06-06 16:49:31 -07:00
Jessica Wang
506825ef69
bug 9878: cloudStack UI - VW Wizard - empty hypervisor dropdown before adding options.
2011-06-06 16:20:02 -07:00
Jessica Wang
5abe9a3e79
bug 7553: cloudStack - Router page - add new action "change service".
2011-05-31 16:40:22 -07:00
Jessica Wang
3b9c9815c8
bug 7553: listServiceOfferings API has a new parameter "issystem" now. Change UI to call "listServiceOfferings&issystem=false" for listing non-system service offerings.
2011-05-31 12:04:08 -07:00
Jessica Wang
8901d0e73c
Bug 8691: Instance page - Attach ISO action - make ISO dropdown list all ISOs (including community ISO and featured ISO).
2011-05-10 14:22:34 -07:00
Jessica Wang
98f7abb6dc
cloudStack UI - Instance page (multiple-selection-middle-menu page) - fix a bug that multiple-selection menu behaved weird on slow machine (e.g. Chandan's machine).
2011-05-10 12:01:51 -07:00
Jessica Wang
4c6833b8f2
bug 9687: CloudStack UI - Instance page - Security Group tab - add ingress rules under each security group.
2011-05-05 15:49:45 -07:00
Jessica Wang
57b08cb76b
CloudStack UI - Instance page - add "Security Group" tab.
2011-05-02 19:42:42 -07:00
Jessica Wang
b9c8cb0179
refresh host/primarystorage/systemvm/router/instance status every 5 seconds instead of every 2 seconds.
2011-04-27 12:50:13 -07:00
will
d4bc7c8d2e
bug 8898: Change Service and Reset Password will now be always visible when VM is running. However, we will now prompt a dialog that explains that the VM must first be stopped before allowing this.
2011-04-04 10:40:17 -07:00
will
b6c59745de
bug 9029: Prevent user and domain-admin from migrating VMs.
2011-03-17 11:36:14 -07:00
will
51fd3ff2ca
Added the check for root device type == PreSetup (Fibre Channel) when allowing whether a VM can be migrated or not.
2011-03-17 11:34:45 -07:00
will
65ca813c24
bug 3316: Now, only show migrate instance if the VM has been launched in XenServer.
2011-03-11 17:48:17 -08:00
will
456d93bc9a
bug 3316: Added support to no longer show Migrate Instance if we are using local disk storage.
2011-03-11 17:45:02 -08:00
will
0ed91473ba
bug 3316: Added a processing message while migrating an instance.
...
- Changed the call of migrate vm from sync to async
- Defaulted to an empty select box if attempting to migrate a vm with local storage
2011-03-11 17:18:35 -08:00
will
85e892bded
bug 3316: Added initial UI support to live migrate VMs.
2011-03-11 16:33:18 -08:00
Jessica Wang
8398f03ef7
bug 8704: "listNetworks&domainId=N&account=xxxxxxx" API has been changed to return both account specific and shared networks. Here is corresponding UI change.
2011-03-03 19:12:51 -08:00
Jessica Wang
901a31c898
bug 8636: change domain dropdown to autoComplete input textbox - rename applyAutoComplete().
2011-02-28 10:30:34 -08:00
Jessica Wang
913903cbe6
bug 8655: if zone.securitygroupsenabled is true and users still choose to select network instead of security group, then UI won't show shared networks whose securitygroupenabled is true
2011-02-25 21:01:33 -08:00
Jessica Wang
2225d2cf31
bug 8655: if zone.securitygroupsenabled is true and users still choose to select network instead of security group, then UI won't show networks whose securitygroupenabled is true
2011-02-25 20:18:32 -08:00
Jessica Wang
1ffd861846
bug 8655: VM Wizard - step 4 - NOT create virtual network when zone.securityGroupsEnabled is true and users choose to launch VM on private network instead of using security groups.
2011-02-25 19:27:51 -08:00
Jessica Wang
df4fbe796b
bug 8655: VM Wizard - step 4 - If Security Group Network is used AND there is at least one dedicated direct tagged default network for the account, then prompt “Do you wish to launch your VM on a private cloud/network?” If Yes, present network container. If No, present security groups container.
2011-02-25 17:03:03 -08:00
Jessica Wang
3308c514f5
bug 8655: VM Wizard - step 4 - show security group container if zone.securitygroupsenabled is true; otherwise show network container.
2011-02-24 19:54:14 -08:00
Jessica Wang
81d351368b
listNetworkOfferings API has been changed to take in guestIpType parameter instead of trafficType parameter. Here is related UI change.
2011-02-24 16:32:33 -08:00
Jessica Wang
88447a8aa2
Create account dialog - domain autoComplete - change it from case-sensitive to not case-sensitive.
2011-02-24 11:37:23 -08:00
