b3478c377e
Full opensource
2011-08-23 19:52:19 -07:00
5c12f07462
Added environment variables to not control pool master
2011-08-23 15:49:45 -07:00
4f8a52f94c
Move VMware/Premium Secondary storage VM to opensource
2011-08-23 14:43:39 -07:00
d3eb9db7fa
bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
...
status 11204: resolved fixed
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
3ed2385582
bug 11212: disable vlan network when vm fails to start. It is still possible for it leak. For example, if the VM object wasn't constructed and we already failed but those cases are less likely and it's not absolutely necessary to disable vlan.
2011-08-23 11:29:29 -07:00
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
cbbf80cee3
Use class.getSimpleName in ResourceListener
2011-08-19 17:06:58 -07:00
7091a8f00a
Introduce new resource life cycle listener
...
add files
2011-08-19 17:06:23 -07:00
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
4369b0ba96
bug 1067:
...
- covered basic impelementation for xen, need to test corner cases.
- Not implemneted: kvm, vmware , listing of egress rules.
2011-08-19 11:10:16 +05:30
d726b26180
Defined missing length field for VO classes
2011-08-17 15:13:28 -07:00
c82a373327
Defined missing length field for VO classes
2011-08-17 15:10:07 -07:00
08a1809a49
bug 11133: field size should be declared in VO object explicitly if it's greater than 255
...
status 11133: resolved fixed
2011-08-16 14:38:49 -07:00
52318703fd
bug 11133: field size should be declared in VO object explicitly if it's greater than 255
...
status 11133: resolved fixed
2011-08-16 14:38:32 -07:00
b9183c0840
bug 10561: merging code from 2.2.10 to master
2011-08-16 14:20:51 +05:30
d72200bbfc
If one of the static nat rules failed to apply on the backend, the end result should be false
2011-08-15 10:18:44 -07:00
02aec3b3ef
revert pool vm sync to host vm sync in startupcommand in 2.2.10.
...
then XenServer upgrade is supported in 2.2.10
2011-08-15 10:18:10 -07:00
803255b0ba
bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now
...
status 11029: resolved fixed
Commit also includes the following:
* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule
2011-08-15 10:18:09 -07:00
5ef0c96e70
bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now.
2011-08-12 14:30:34 +05:30
f1d13729af
bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now.
2011-08-12 12:21:02 +05:30
51af0db682
mass merge 2.2.10
2011-08-11 16:41:52 -07:00
278f2a401f
bug 10561: intermediate checkin for enable/disableStaticNat.
...
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
2011-08-11 10:19:22 -07:00
501048952d
Revert "bug 11064: add setfirewallrule for kvm"
...
This reverts commit 8b52313bd9fceceb3c4c5ff2b849652cbd37258c.
2011-08-11 09:45:14 -07:00
58862d702c
Revert "bug 11064: add setfirewallrule for kvm"
...
This reverts commit c9f36c07c22dfe3073efc1dfc0cae290fc6e880a.
2011-08-10 17:59:13 -07:00
3a2790abdc
bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
...
status 10504: resolved fixed
2011-08-10 17:46:48 -07:00
5639b5eab8
bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
...
status 10504: resolved fixed
2011-08-10 17:45:46 -07:00
94ff9fe2c1
bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
...
status 10504: resolved fixed
2011-08-10 17:41:19 -07:00
5a34c9259b
bug 11064: add setfirewallrule for kvm
2011-08-10 16:18:23 -07:00
790af4dcb3
bug 11064: add setfirewallrule for kvm
2011-08-10 16:18:03 -07:00
fde6e7d801
bug 11064: add setfirewallrule for kvm
2011-08-10 16:17:00 -07:00
fe3dd44bec
ICMP protocol is supported in createFirewallRule command only; throw an error if specified in createPF/StaticNat/LB rule
2011-08-10 12:56:25 -07:00
32b53351ff
Fixed response processing in createFirewallRule command
2011-08-10 11:36:34 -07:00
f5011189c8
bug 10561: code cleanup
2011-08-10 18:15:07 +05:30
a9eb14c42e
bug 10561: backend added for CreateFirewallRule and deleteFirewallRule
2011-08-10 17:06:42 +05:30
f24e14d2d9
bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules
2011-08-10 10:43:26 +05:30
bfe3fd2a8f
bug 11046: fixed a typo, otherwise Other PV doesn't work
...
status 11046: resolved fixed
2011-08-09 19:58:10 -07:00
e5e85d05e9
bug 10695: add XCP 1.0 support
...
status 10695: resolved fixed
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
2011-08-09 19:51:32 -07:00
33b3e02c17
bug 10695: add XCP 1.0 support
...
status 10695: resolved fixed
2011-08-09 19:49:12 -07:00
f377ac1cf7
Use class.getSimpleName in ResourceListener
2011-08-09 15:56:17 -07:00
6b9603bc4c
bug 10561: intermidiate checkin for FirewallRuleFeature
...
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
Conflicts:
api/src/com/cloud/api/BaseCmd.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
cd94e6ac25
bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules
2011-08-09 16:05:20 +05:30
179368ea32
get lb working on advanced mode again
2011-08-09 01:02:58 -07:00
924961d898
merge nectarine
2011-08-08 21:45:37 -07:00
06d007337a
bug 10561: intermidiate checkin for FirewallRuleFeature
...
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -07:00
c5a999757a
get ELB working on 2.2.8
2011-08-08 17:58:35 -07:00
19ae5fbe55
Introduce new resource life cycle listener
...
add files
2011-08-08 17:05:27 -07:00
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -07:00
6aaf3d5ae0
Merge branch 'cvm'
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/storage/Storage.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/storage/StorageManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
d10c8e2a1d
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:30:50 -07:00
frank
Alex Huang
Kelven Yang
alena
Naredula Janardhana Reddy
anthony
Nitin
Chiradeep Vittal
Edison Su
Abhinandan Prateek