Commit Graph

4936 Commits

Author SHA1 Message Date
Nitin Mehta 02407c48f3 Bug 10808: Add Upload Volume api and do validation. 2012-04-30 09:43:23 +05:30
Abhi 6726f3b0d0 bug CS-14663: accepting encoded password for MD5 2012-04-28 12:30:29 +05:30
Salvatore Orlando ce56ddf75a CS-14606: Restoring config parameter which was accidentally removed 2012-04-27 17:13:10 +01:00
Salvatore Orlando 6e024e945d CS-14606: Change name for config parameter 2012-04-27 16:38:33 +01:00
Alena Prokharchyk 7e4c5e1267 CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables 2012-04-26 10:09:53 -07:00
Salvatore Orlando 23b20e3b04 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-04-25 20:06:26 +01:00
Alena Prokharchyk 1c9af77f59 Set ha host to false when no ha tag is enabled 2012-04-25 11:04:07 -07:00
Salvatore Orlando 88131e5db6 CS-14605: OVS cleanup
Fix syntax errors in ConfigurationManager and Resource Manager test

Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
	server/test/com/cloud/agent/manager/ResourceManagerTest.java
2012-04-25 15:11:05 +01:00
Salvatore Orlando 33a2b17972 CS-14605: OVS Tunnel Manager Clean-up
1) Remove old VLAN-in-overlay manager
2) Remove unused DAO objects
3) Fix code using removed object (all stale lines)

Conflicts:

	server/src/com/cloud/network/ovs/GreTunnelException.java
	server/src/com/cloud/network/ovs/OvsVlanExhaustedException.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountDao.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountDaoImpl.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountVO.java
2012-04-25 15:03:47 +01:00
Salvatore Orlando f7836ba61c Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-04-25 09:50:48 +01:00
Alena Prokharchyk 4e3bdb62d2 Account specific vlan ranges - fixed deleteVlanRange
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 17:16:58 -07:00
Alena Prokharchyk 319d4c5cfd Catch all exceptions when change engine and row_format - can fail when table is full. Just skip as its not a critical fix 2012-04-24 15:49:14 -07:00
Salvatore Orlando 8779f0ed25 CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' 2012-04-24 21:34:10 +01:00
Alena Prokharchyk ccd0472201 CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 11:42:53 -07:00
anthony f0a4044d29 add CentOS 6.0, CentOS 5.7, RHEL 5.7 support for XenServer 6.0.2 2012-04-24 10:50:34 -07:00
Salvatore Orlando ef13158c2b CS-14437: Fixing remaining merge issues affecting tunnel creation
Tunnel networks now work on this branch
(VLAN networks never stopped working)
2012-04-24 15:21:41 +01:00
Salvatore Orlando 48b6236c64 Fixing merge issues for OVS tunnel manager 2012-04-24 02:22:10 +01:00
Salvatore Orlando 6f3ab6de5d Removing basic connectivity provider and OVS network offering as not
needed for Bonita
2012-04-24 02:20:39 +01:00
Salvatore Orlando 421862216e Now finding the IP address also for the remote endpoint
Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:39 +01:00
Salvatore Orlando 1ddcdb25c1 Forgot to add new dao into component library! 2012-04-24 02:20:39 +01:00
Salvatore Orlando cc344ad038 Adding DB support for interfaces OVS tunnel manager will use as GRE endpoints
Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando 24a567ac43 Removing superfluous log statements 2012-04-24 02:20:38 +01:00
Salvatore Orlando 275840bcdb Now using vnets instead of network id for creating networks
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando 2d12cfbc87 Fixing remaining issues with per-VIF flow script and removing version-specific scripts.
Now generating XSnetwork names using gre keys

Plus other minor corrections

Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando 58165221ef Now using vnets instead of network id for creating networks
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:37 +01:00
Salvatore Orlando f786505a1b Adding Missing file to source control 2012-04-24 02:20:37 +01:00
Salvatore Orlando 8c398654d3 Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master

Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:37 +01:00
Salvatore Orlando 6ca198e6f3 Bug 14370 - addSecondaryStorage always fails: "Can't find pod with specificied podId null"
status 14370: resolved fixed

Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-04-24 02:20:36 +01:00
Alena Prokharchyk 0527cad0b7 CS-14256: throw executionException when finalizeStart fails (no point to retry). 2012-04-23 15:56:10 -07:00
Abhi bfc4fe8ca5 bug CS-14593, CS-14541: fixed encryption issue 2012-04-23 15:08:35 +05:30
kishan d122637761 bug CS-14587: Process 500 rows at a time to encrypt vnc_password in vm_instance table. Added addtional logging.
status CS-14587: resolved fixed
reviewed-by: Alena
2012-04-22 22:33:22 +05:30
Alena Prokharchyk 5603359794 Fixed db upgrade bug: do vnc password encryption only for non-removed vms 2012-04-21 22:30:16 -07:00
Alena Prokharchyk 8973955350 More logging to the db upgrade 2012-04-21 22:29:43 -07:00
anthony 2c25be48e8 bug 14582: fix one big in upgrade from 2.1.4 to 3.0.2
status 14582: resolved
2012-04-20 17:06:03 -07:00
Alena Prokharchyk 7d3eea8225 Fixed db upgrade for 2.1-3.0 2012-04-20 12:00:24 -07:00
Kelven Yang 549a320832 Don't use dynamic quiried key size as it varies on different JVM implementation and security providers 2012-04-20 11:42:15 -07:00
kishan e730f888d1 bug CS-14576: Fail 2.2.14 to 3.0.0 upgrade if encryption is not enabled
status CS-14576: resolved fixed
reviewed-by: Nitin

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-04-20 16:05:11 +05:30
Nitin Mehta d493262354 bug CS-14530: Whwnever creating an agent of type Routing update the capacity state as there is a transition in the resource state of the host.
Reviewed By: Kishan
2012-04-20 11:04:11 +05:30
Nitin Mehta 9f63a3d2bb bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled.
Reviewed By: Kishan
2012-04-20 10:56:27 +05:30
Sheng Yang ea26cefbe5 CS-14542: Fix wrong traffic label for KVM agent 2012-04-19 18:24:15 -07:00
prachi a5fddd604a Bug 14158 - 2.2.x - 3.0 db upgrade for multiple physical networks
-Create multiple physical networks if there are distinct tags found in network_tags table.
-One physical network per tag.
-Currently all tags flow to xenserver traffic type label.
2012-04-19 15:11:32 -07:00
Kelven Yang 4d28e40c00 Hardening console proxy AJAX protocol to address security concerns 2012-04-19 12:07:35 -07:00
kishan 133745b652 bug CS-14566: set up physical networks before encrypting config values
status CS-14566: resolved fixed
reviewed-by: Nitin
2012-04-19 21:59:30 +05:30
Rajesh Battala d4396da506 CS-14546: Fixed bug Unable to view console in System and Guest VMs and Added Upgrade script 2012-04-19 15:05:42 +05:30
Likitha Shetty bbe4928546 Revert "Revert "Revert "CS-14546: Fixed bug Unable to view console in System and Guest VMs"""
This reverts commit bcfbc81de1.

Unable to view console in System and Guest VMs
2012-04-19 14:31:05 +05:30
Likitha Shetty bcfbc81de1 Revert "Revert "CS-14546: Fixed bug Unable to view console in System and Guest VMs""
This reverts commit 0147d878a5.

reverting as commit went on wrong e-mail id.
2012-04-19 14:24:08 +05:30
Likitha Shetty 0147d878a5 Revert "CS-14546: Fixed bug Unable to view console in System and Guest VMs"
This reverts commit 5465edf02f.
2012-04-19 14:18:02 +05:30
Likitha Shetty 5465edf02f CS-14546: Fixed bug Unable to view console in System and Guest VMs 2012-04-19 14:03:12 +05:30
Alena Prokharchyk d51d018a1b CS-14553: db upgrade - for default network offerings:
1) Change display text to match fresh 3.0.2
2) Delete lb service for the offerings using VR as a provider and not having source nat service
2012-04-18 17:10:41 -07:00
kishan b88019ad8f bug CS-14532: during 2211-2212 upgrade, do not add resource count entries for resourceTypes that were added in later releases
status CS-14532: resolved fixed
reviewed-by: Nitin
2012-04-18 15:40:30 +05:30