Chiradeep Vittal
64efcf0443
Merge branch '2.2.8' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.8
2011-08-08 22:42:10 -07:00
Chiradeep Vittal
301bf049d1
fix compile issues
2011-08-08 22:03:08 -07:00
Chiradeep Vittal
924961d898
merge nectarine
2011-08-08 21:45:37 -07:00
alena
ae9ba8996a
Fixed restarNetwork for networks of type Direct - was broken with checkin bfdb4d2d989ed00adcbbf5455731cc2980afcb7b
2011-08-08 21:33:34 -07:00
alena
c5502fb8aa
Fixed the bug when domR was re-created as a part of implement() method in network gurus with sourceNatIp address belonging to incorrect user (System user instead of network owner).
2011-08-08 21:17:24 -07:00
alena
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
Kelven Yang
a3fb501378
adjust to merged changes
2011-08-08 18:44:14 -07:00
Kelven Yang
39a3d82f11
Add prepareTemplate command(admin only) to allow pre-loading template into primary storage
2011-08-08 18:37:26 -07:00
anthony
1a070f4c1b
bug 11014:
...
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning
status 11014: resolved fixed
2011-08-08 18:28:34 -07:00
Naredula Janardhana Reddy
12cadca538
Revert "bug 10561: Allowing ICMP traffic through static NAT"
...
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
2011-08-08 17:59:05 -07:00
Chiradeep Vittal
c5a999757a
get ELB working on 2.2.8
2011-08-08 17:58:35 -07:00
Chiradeep Vittal
1228e6ed27
merge ELB / nectarine branch
2011-08-08 15:21:20 -07:00
Chiradeep Vittal
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -07:00
Naredula Janardhana Reddy
9e9ae52dbf
Revert "bug 10561: Allowing ICMP traffic through static NAT"
...
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
2011-08-09 00:08:07 +05:30
Chiradeep Vittal
1e82b65983
Ensure upgrade picks up new db configs
2011-08-05 18:13:52 -07:00
Chiradeep Vittal
b4a6f2103a
ensure that we pick an idle elb vm in the same pod as the ip
2011-08-05 17:46:42 -07:00
Chiradeep Vittal
ec7c9a2f7e
bug 10998: maintain lb id in map table
...
status 10998: resolved fixed
2011-08-05 17:37:11 -07:00
keshav
b8c9205000
Changed findOrCreateDhcpServers() to check if start IP is null before retrieving an IP address object
2011-08-05 17:03:20 -07:00
Chiradeep Vittal
bb313a61f0
bug 10659: reuse unused elb vms if they are not gceed already
2011-08-05 15:17:58 -07:00
Chiradeep Vittal
0e5cf4831d
remove accidental commit
2011-08-05 14:11:19 -07:00
alena
797263265e
bug 10994: Fixed NPE in destroySystemVm api
...
status 10994: resolved fixed
2011-08-05 12:45:57 -07:00
Chiradeep Vittal
5552b650ff
Merge branch 'guru' into 2.2.8.nectarine
2011-08-05 12:27:47 -07:00
Chiradeep Vittal
68a450b5a4
initialize search builder
2011-08-05 12:26:15 -07:00
Chiradeep Vittal
60e21d5611
initialize search builder
2011-08-05 12:17:19 -07:00
Chiradeep Vittal
ac8b833fb0
Ensure lb vm enables only those services that are necessary. ensure default route
2011-08-05 12:16:55 -07:00
Sheng Yang
7a3edd74d5
Fix missing lock releasing in VirtualNetworkApplianceManagerImpl.java
2011-08-05 12:14:42 -07:00
Sheng Yang
7638f8e7a7
bug 10991: Determine existing redundant router using both state and host id
...
Seems in some condition, when a router is stopped, it's host_id != null.
status 10991: resolved fixed
2011-08-05 11:36:35 -07:00
Abhinandan Prateek
415db5a126
bug 10969: name of VM is instance name, instead of display name
...
status 10969: resolved fixed
2011-08-05 13:16:39 +05:30
Abhinandan Prateek
51e43be06c
bug 10969: name of VM is instance name, instead of display name
...
status 10969: resolved fixed
2011-08-05 13:14:28 +05:30
Abhinandan Prateek
0f2a9b6a69
bug 10748: fixed it when the VM acts as a dhcp server only
...
status 10748: resolved fixed
2011-08-05 12:02:54 +05:30
Abhinandan Prateek
c460a1b80b
bug 10748: fixed it when the VM acts as a dhcp server only
...
status 10748: resolved fixed
2011-08-05 11:58:48 +05:30
Chiradeep Vittal
0c408d8da5
handle elb vm restart
2011-08-04 22:05:48 -07:00
Kelven Yang
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
Chiradeep Vittal
61fd6a79c8
ensure elb vm is managed by elb manager
2011-08-04 17:02:27 -07:00
Kelven Yang
d9392a6aa7
guard GlobalLock lock with finally clause
2011-08-04 16:19:28 -07:00
anthony
41759c153d
bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed.
...
status 10964: resolved fixed
2011-08-04 16:08:50 -07:00
anthony
3272241440
bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume
...
status 9255: resolved fixed
2011-08-04 15:28:38 -07:00
Edison Su
1d49275ca8
release capacity if current state is in starting and not transit to running
2011-08-04 14:26:21 -07:00
Edison Su
ccdfe240bd
don't put cpu/mem into reserved capacity if failed to start/stop vm
2011-08-04 14:26:21 -07:00
Chiradeep Vittal
e936a52f10
merge changes from parent branch
2011-08-04 12:39:25 -07:00
alena
6882b39a1e
Fixed upgrade for volumes table
2011-08-04 11:22:25 -07:00
alena
4abb737c04
Fixed upgrade for volumes table
2011-08-04 11:22:04 -07:00
alena
294e30d7c2
Merged 228-229 db upgrade from 228 branch
2011-08-04 10:19:23 -07:00
alena
3d0758691f
bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
...
status 10954: resolved fixed
Conflicts:
setup/db/db/schema-228to229.sql
2011-08-04 10:01:06 -07:00
alena
527c3b024f
bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
...
status 10954: resolved fixed
2011-08-03 20:46:33 -07:00
Chiradeep Vittal
e5c4bf4e28
bug 10659: manage elb vms independently of virtualnetworkappliance.
2011-08-03 18:55:01 -07:00
Sheng Yang
a46c2cb650
Send CheckRouter command only when router is running
2011-08-03 16:57:43 -07:00
alena
da4b39279d
Added 229 to 2210 upgrade path
...
Conflicts:
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
setup/db/db/schema-228to229.sql
2011-08-03 10:23:27 -07:00
alena
cf7e351cbf
bug 10921: remove obsolete keys during 2.1.x to 2.2.9 upgrade
...
status 10921: resolved fixed
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
2011-08-03 10:15:09 -07:00
Naredula Janardhana Reddy
46427fef91
bug 10561: Allowing ICMP traffic through static NAT
2011-08-03 21:15:02 +05:30