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
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
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
c5a999757a
get ELB working on 2.2.8
2011-08-08 17:58:35 -07:00
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -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
19567df49b
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:27:45 -07:00
61fd6a79c8
ensure elb vm is managed by elb manager
2011-08-04 17:02:27 -07:00
5322accbc8
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:23:11 +05:30
9e90999aab
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:15:31 +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
4bc8686513
bug 10429: Backport redundant virtual router
...
Part 1
This backport contained:
commit 52317c718c25111c2535657139b541db0c9d1e1f
bug 9154: Initial check in for enabling redundant virtual router
commit 54199112055d754371bfb141168fb5538bf6d6ea
Add host verification for CheckRouterCommand
commit cef978a228c90056ead9be10cbc4de74c2b8de76
Fix CheckRouterAnswer's isMaster report
commit 4072f0a6991ac3b63601a1764fbe14188965f62f
Some build fixes and code refactoring for redundant router
commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
Redundant Router: Fix OVS
commit 6a228830e7c46d819fa0c3317e159e041337e887
Fix findByNetwork()/findByNetworkAndPod()'s return
commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
Redundant Router: Fix isVmAlive()
commit e1275d2514adc41f8744f5107d4069c38be195f1
Only issue CheckRouterCommand to redundant routers
And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes
in the master branch.
2011-07-18 18:29:56 -07:00
9466106c40
bug 9154: Add isRedundantRouter to DomainRouterResponse
2011-06-15 14:39:28 -07:00
07a61686db
bug 9154: Add redundant state to DomainRouterResponse
2011-06-14 19:31:24 -07:00
aef562c69d
bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB
...
Then we can distingush BACKUP state from UNKNOWN state(which means we didn't get
valid answer from CheckRouterCommand).
2011-06-14 18:48:56 -07:00
8e4ec4ce09
bug 8962: moving vm from one account to other
2011-06-09 15:02:47 +05:30
62ac899091
bug 9154: Initial check in for enabling redundant virtual router
...
This patch enable redundant virtual routers.
1. To enable this feature, db need to be updated using follow SQL by now(we
would get a UI way later):
UPDATE network_offerings SET redundant_router=1 WHERE guest_type="Virtual" AND
system_only=0;
2. System would try to start up two routers at different hosts. But if there is
only one host in the zone, system would start up two routers on it.
3. The failover part is using keepalived, and connection tracking part is using
conntrackd. There would be one master router and one backup router. The status
of router(master or backup) can be query from the database table domain_router
now. Management server would update the status every 30s by default.
4. The routers for the same zone would use same external NIC(same ip and mac).
The script used for fail-over would ensure only one external NIC present in the
network at any time.
5. Currently management server don't got the ability to stop one of router is
both of them reported as master. The feature is in the todo list.
After two routers start up, disconnect anyone of them, the guest network
shouldn't be affected, and established connection(http, ssh, etc.) should still
works. The fail-over on gateway part should be 3~4 seconds.
Currently the patch works with KVM. Would deal with vmware and XenServer soon.
2011-06-07 14:47:45 -07:00
d9e0bcfa1e
bug 10126: Renamed getPodId() to getPodIdToDeployIn()
2011-06-03 22:17:08 -07:00
8c4e831cfb
bug 7553: cloudStack - server-side - make listRouters API return “serviceofferingname” and “serviceofferingid”.
2011-05-31 17:40:30 -07:00
bbc470ed4f
bug 9619: handle two types of domr name
...
status 9619: resolved fixed
2011-04-29 14:13:25 -07:00
671ec62358
bug 9623: set ha_enable to false for consoleProxy vms and service_offering.
...
status 9623: resolved fixed
Also set ram_size to 1024 for console proxy offering during the upgrade
Conflicts:
core/src/com/cloud/vm/SecondaryStorageVmVO.java
server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2011-04-29 11:53:07 -07:00
99bc15f64a
changed getName to getHostname
2011-04-29 08:34:10 -07:00
c12ccbd06f
Bug 9534 : implement CPU cap
...
Introducing new boolean flag in service offering to restrict the user VM's CPU utilization to what service offering it is entitled for.
2011-04-27 13:54:45 +05:30
d6b5acb852
bug 8532,8755: don't create multiple HA work if there already has one of HAwork of this VM is created, but not finished
...
status 8532: resolved fixed
status 8755: resolved fixed
2011-04-14 17:46:54 -04:00
92155522f2
Add license header to files
2011-04-14 11:23:14 -07:00
80fe0b584d
More changes for Bug 9387:
...
- Update system vm_instance's template_id if it does not match the system vm template.
- Use _templateDao.findSystemVMTemplate to find the latest system vm template.
2011-04-12 18:20:01 -07:00
ea95ac1808
bug 8713 : finalize the implementation of supporting system vm pooling
2011-03-31 17:14:09 -07:00
7dd54f079b
started vms with these latest
2011-02-11 17:03:04 -08:00
86e51eb536
Made changes to the exceptions thrown by NetworkManagerImpl
2011-02-04 11:56:20 -08:00
fc97034000
refactor vmstatelistener
2011-01-26 11:01:43 -05:00
9d3eedaf01
removed gateway and guestzonemacaddress from domr
2011-01-24 17:50:32 -08:00
463835e7d7
removed unused domain in system vms
2011-01-24 17:50:32 -08:00
3dd7301fb2
removed unused gateway
2011-01-24 17:50:32 -08:00
68464d6f66
removed unused dns
2011-01-24 17:50:32 -08:00
c59e576a51
removed unused dns
2011-01-24 17:50:32 -08:00
65034995a3
removed unused guest ip fields from system vm
2011-01-24 17:50:32 -08:00
1a7617bb95
removed unused vlan fields from system vm
2011-01-24 17:50:32 -08:00
4589446930
removed unused domain_router_id from uservm
2011-01-24 16:56:00 -08:00
20891ae6f9
removed unused guest ip fields from uservm
2011-01-24 16:55:59 -08:00
580f42b50d
removed unused external ip and mac address field
2011-01-24 16:55:59 -08:00
a55d395b86
removed unused vnet field
2011-01-24 16:55:59 -08:00
fc33ef2be2
Removed several unused fields after the refactoring
2011-01-24 16:18:40 -08:00
57def20cf6
moved all agent commands to api.
2011-01-20 09:54:05 -08:00
d43717eef8
merge changes
2011-01-14 15:12:13 -08:00
877741030c
bug 7957: set network domain for domain router based on Network networkDomain parameter. Default networkDomain is "cloud.internal"
...
status 7957: resolved fixed
2011-01-13 11:57:29 -08:00
4bb42e43cc
Get UserVm details via UserVmDao.loadDetails().
...
Also, removed references to ssh public key in UserVmVO and the underlying
table and used user_vm_details instead.
2011-01-12 23:24:17 +00:00
83b3580c32
Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
...
Conflicts:
client/tomcatconf/commands.properties.in
core/src/com/cloud/vm/UserVmVO.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-01-12 17:06:08 +00:00
3e59707dd2
Added user_vm_details table and corresponding access objects.
...
Moved saved encrypted passwds for getVMPassword API cmd to this new table.
Removed SSH keypair id from UserVm - only public key is needed.
2011-01-12 16:32:36 +00:00
ad4ed5b2fd
added hypervisor type to vm
2011-01-11 18:02:09 -08:00
alena
Chiradeep Vittal
Kelven Yang
Murali Reddy
Sheng Yang
Abhinandan Prateek
Alex Huang
Jessica Wang
anthony
Edison Su
Frank
prachi
Ragnar B. Johannsson