alena
c9e60d703d
Fixed listNetwork by id
2011-08-23 01:03:40 -07:00
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
alena
b93c7bc613
Merge branch '2.2.10' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
2011-08-22 14:14:12 -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
7184d073b9
bug 11202: cloudStack - Service Offering page - fix a bug that Network Rate didn't get refreshed when another service offering is selected.
2011-08-22 13:56:03 -07:00
Jessica Wang
fc6086067c
bug 11202: cloudStack - Service Offering page - add Network Rate in grid.
2011-08-22 13:56:01 -07:00
Jessica Wang
47776f5814
bug 11202: cloudStack - Create Service Offering dialog - add Network Rate field.
2011-08-22 13:56:00 -07:00
Jessica Wang
4e0a12f94e
cloudStack - add new localization labels.
2011-08-22 13:55:59 -07:00
Jessica Wang
101b7e38d8
bug 11202: cloudStack - Service Offering page - fix a bug that Network Rate didn't get refreshed when another service offering is selected.
2011-08-22 13:48:06 -07:00
Jessica Wang
409964eff5
bug 11202: cloudStack - Service Offering page - add Network Rate in grid.
2011-08-22 13:37:55 -07:00
alena
001a5777c7
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:36:00 -07:00
alena
c2732850f4
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:35:43 -07:00
alena
0b061529b1
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:34:47 -07:00
Jessica Wang
dde63dce90
bug 11202: cloudStack - Create Service Offering dialog - add Network Rate field.
2011-08-22 13:30:07 -07:00
Jessica Wang
b0cf6080fe
cloudStack - add new localization labels.
2011-08-22 13:29:43 -07:00
alena
31a022c720
Added networkRate parameter to createServiceOffering api command
...
Conflicts:
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2011-08-22 12:05:34 -07:00
alena
033765f93f
Added networkRate parameter to createServiceOffering api command
2011-08-22 12:02:08 -07:00
alena
65afbc529e
Added networkRate parameter to createServiceOffering api command
2011-08-22 11:58:08 -07:00
alena
0998b04098
Fixed security issue in listNetworks
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2011-08-22 10:51:44 -07:00
alena
20a518f3ac
Fixed security issue in listNetworks
2011-08-22 10:50:30 -07:00
alena
67e3936ae1
Fixed security issue in listNetworks
2011-08-22 10:49:27 -07:00
Alex Huang
009e60266d
fix for the problem of locking connection being gone
2011-08-22 10:08:22 -07:00
Alex Huang
29a0f8b1f8
fix for the problem of locking connection being gone
2011-08-22 10:07:30 -07:00
Alex Huang
40dac77872
fix for the problem of locking connection being gone
2011-08-22 10:05:37 -07:00
prachi
8755044ea9
Merge Bug 11186 from 2.2.8mango
...
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created
Changes:
- We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the
VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:12:15 -07:00
prachi
3d4767c94c
Merge Bug 11186 from 2.2.8mango
...
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created
Changes:
- We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:02:09 -07:00
anthony
7084c270d3
reversed funtion parameter
2011-08-19 18:48:49 -07:00
anthony
2e2e550cc4
reversed funtion parameter
2011-08-19 18:41:59 -07:00
Edison Su
3ccc790b1d
add sample code to config advanced zone
2011-08-19 18:06:11 -07:00
anthony
2317c426db
reversed funtion parameter
2011-08-19 18:05:39 -07:00
Edison Su
49f283f364
add sample code to config advanced zone
2011-08-19 18:05:37 -07:00
frank
b607e4aa1c
Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y
2011-08-19 17:29:57 -07:00
frank
32ee2dbe2c
Remove baremetal specific parameters from AddHostCmd
2011-08-19 17:12:23 -07:00
frank
cbbf80cee3
Use class.getSimpleName in ResourceListener
2011-08-19 17:06:58 -07:00
frank
016700737c
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-19 17:06:48 -07:00
frank
7350d12fff
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-19 17:06:35 -07:00
frank
7091a8f00a
Introduce new resource life cycle listener
...
add files
2011-08-19 17:06:23 -07:00
frank
0f109dd037
Introduce new resource life cycle listener
2011-08-19 17:06:12 -07:00
Edison Su
2e48a9188d
add new testcase class, make testcase pydev friendly
2011-08-19 16:22:02 -07:00
Edison Su
3466d3f637
add new testcase class, make testcase pydev friendly
2011-08-19 16:21:16 -07:00
Edison Su
7a7662b01b
fix typo
2011-08-19 16:15:52 -07:00
Edison Su
eb72d340e2
fix typo
2011-08-19 16:15:17 -07:00
Sheng Yang
7ccc833114
Fix potential redundant router FAULT state by dnsmasq
...
This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it.
2011-08-19 16:11:48 -07:00
Sheng Yang
d9b0188d7e
Fix potential redundant router FAULT state by dnsmasq
...
This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it.
2011-08-19 16:11:33 -07:00
Sheng Yang
977543a007
Fix potential redundant router FAULT state by dnsmasq
...
This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it.
2011-08-19 16:09:45 -07:00
frank
18f87c2108
Merge branch 'cvm' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
Edison Su
56244c7c47
release the check
2011-08-19 16:07:55 -07:00
Edison Su
de25a63ba8
release the check
2011-08-19 16:06:13 -07:00
Jessica Wang
0cce5c44c2
bug 10790: cloudStack - Volume page - hide Storage from domain-admin as well.
2011-08-19 15:05:45 -07:00
Jessica Wang
a796b2b1b7
bug 10790: cloudStack - Volume page - hide Storage from domain-admin as well.
2011-08-19 15:04:39 -07:00
