9391938908
fix conflict
2011-08-24 18:47:09 -07:00
85f18ff256
fix build, add test rpm back
2011-08-24 13:24:51 -07:00
bd439831ad
bug 11181: batching the select statements
2011-08-24 16:34:28 +05:30
b3478c377e
Full opensource
2011-08-23 19:52:19 -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
c2732850f4
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:35:43 -07:00
0b061529b1
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:34:47 -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
8d4c7208a4
bug 11094: delinking api layer objects from dao layer
2011-08-19 15:23:49 +05:30
601708c3e6
bug 11094: delinking api layer objects from dao layer
2011-08-19 15:21:03 +05:30
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
c8cf17f6da
Revert "fix NPE when listvolume if vm got destroyed"
...
This reverts commit 9bdaa9d967a6390cc1655ce7344d5af474890e4c.
2011-08-15 10:18:44 -07:00
ec978f0716
fix NPE when listvolume if vm got destroyed
2011-08-15 10:18:10 -07:00
287a695664
Revert "fix NPE when listvolume if vm got destroyed"
...
This reverts commit d028454ab46f1e901e2517dd64a0b8a9780c9968.
2011-08-12 17:32:20 -07:00
25ddb22724
Revert "fix NPE when listvolume if vm got destroyed"
...
This reverts commit b6518399987a17c791f22b991dcea36d57866269.
2011-08-12 17:30:13 -07:00
4df7423f70
fix NPE when listvolume if vm got destroyed
2011-08-12 14:43:07 -07:00
2548269238
fix NPE when listvolume if vm got destroyed
2011-08-12 14:40:46 -07:00
83991a8494
bug 4282: Storing signatures cache using ehcache. ToDo- Relicate cache for clustered mgmt server setup
2011-08-12 20:27:20 +05:30
219336e07c
bug 4282: Initial Checkin. Added new parameters expires, signatureversion. Checking expires time and storing used signatures in-memory locally implemented.
2011-08-10 19:52:43 +05:30
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
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
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
6eacc11222
bug 10994: Fixed NPE in destroySystemVm api
...
status 10994: resolved fixed
2011-08-05 12:46:20 -07:00
797263265e
bug 10994: Fixed NPE in destroySystemVm api
...
status 10994: resolved fixed
2011-08-05 12:45:57 -07:00
695abd5c5a
bug 7826: Check for correct date range. Make DateFormat strict (turn off lenient)
...
status 7826: resolved fixed
2011-08-05 19:44:44 +05:30
c009b56a60
bug 6653: Extract Api's - No need to encode the url's forward slash with %2F as we have the latest version of gson which doesnt err out on forward slash anymore.
...
status 6653: resolved fixed
2011-08-05 18:44:41 +05:30
c73f5da276
bug 10725: add checksum to listIso and registerIso (its an optional parameter for this command).
...
status 10725: resolved fixed
2011-08-03 17:41:29 +05:30
8d47c53735
Revert "bug 10435: removed vpn feature"
...
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2011-08-02 18:12:57 -07:00
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
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
65b0af0a9d
bug 9452: listCapacity - when the hosts > 200 the host_id and storage_pool_id start colliding, to workaround that also compart the capacity type.
2011-07-22 19:30:14 +05:30
fb6a44d248
bug 9452: listCapacity - when the hosts > 200 the host_id and storage_pool_id start colliding, to workaround that also compart the capacity type.
2011-07-22 19:14:47 +05:30
bef3b480cd
bug 10197:
...
The step to upgrade xenserver,
1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts
TODO,
1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:44:37 -07:00
3881e13387
bug 10197:
...
The step to upgrade xenserver,
1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts
TODO,
1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:26:25 -07:00
57f41a3a05
bug 10731: added optional paramter source cidr
2011-07-19 12:21:39 +05:30
24510cd5fb
bug 10731: adding optional paramter for cidr
2011-07-19 12:10:48 +05:30
44d4113ae6
bug 10429: backport redundant router
...
Part 2
commit 797839360c65cd348d2eb20630521177ab0919de
bug 9154: redundant virtual router
commit 8ff7f230204d4d3a7a4adee75523a9a84f4276fe
bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB
commit 230b99e9e0b152648f1dd2a5eab6f22315b8e7b4
bug 9154: Add redundant state to DomainRouterResponse
commit ccefb5ff5e83d713798a347c99bce1a0d04b4317
bug 9154: Add router fault state report
commit 7a3090378f9785caecf741b70554f6ea17c41764
bug 9154: Send alert if found two virtual routers in master state
commit 66831056e4bf27665871bccd24e6159071564847
bug 9154: Code clean up
commit bf3f58a85741fa7118bd848a42d8b21baa4478d4
bug 9154: Add isRedundantRouter to DomainRouterResponse
2011-07-18 18:30:02 -07:00
0d84cde633
bug 10409: added domainSuffix parameters to account/domain objects
2011-07-15 14:40:39 -07:00
4c0fce700b
bug 10639: if register iso for all zones, zoneId is -1,
...
fixed
status 10639: resolved fixed
2011-07-07 21:03:09 -07:00
093af8afdf
bug 10639: if register iso for all zones, zoneId is -1,
...
fixed
status 10639: resolved fixed
2011-07-07 21:01:15 -07:00
9be9a970c9
bug 10409: added domainSuffix parameters to account/domain objects
2011-07-06 16:57:19 -07:00
2fca9d0a49
bug 10603: fixed NPE in listTemplates
...
status 10603: resolved fixed
2011-07-06 14:22:40 -07:00
4727b1229e
bug 10603: fixed NPE in listTemplates
...
status 10603: resolved fixed
2011-07-06 14:21:38 -07:00
05c7995153
Bug 10559 - Couldn't add baremetal template/image throught the ui, zone id passed in was negative
...
resolved fixed
2011-07-05 19:35:26 -07:00
38c0772507
Bug 10560 - Baremetal template created 5 entries when added (edit)
...
resolved fixed
2011-07-05 19:35:15 -07:00
3c4671aac5
Bug 10560 - Baremetal template created 5 entries when added (edit)
...
resolved fixed
2011-07-05 17:22:46 -07:00
4a8812af68
Bug 10559 - Couldn't add baremetal template/image throught the ui, zone id passed in was negative
...
resolved fixed
2011-07-05 16:41:51 -07:00
401e5ce0e9
handle register template/iso to all zones
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
2011-07-01 17:42:59 -07:00
2bd3f6c74e
handle register template/iso to all zones
2011-07-01 17:06:43 -07:00
17f785f07a
Intermidiate checkin for Projects feature; added 3 new apis - create/delete/listProject(s) - as a part of checkin
2011-07-01 13:19:12 -07:00
Edison Su
frank
Abhinandan Prateek
alena
Naredula Janardhana Reddy
kishan
Nitin
anthony
Sheng Yang