Commit Graph

4955 Commits

Author SHA1 Message Date
Likitha Shetty daf2af7e45 Bug 4644 (Pranav) 2012-05-01 13:08:19 +01:00
abhi b5654a6fd1 bug 13673: stopping alien VMs during sync for Xenserver 2012-05-01 13:00:03 +01:00
Alena Prokharchyk a3fb4cf9c1 Update apikey/secretkey in transaction 2012-05-01 11:02:25 +01:00
Nitin Mehta baf6b6eb82 Bug 13591: Remove unwarranted log messages that we are printing with every answer recieved from the agent.
Reviewed-By: Kishan
2012-05-01 11:02:22 +01:00
kishan f2a08afd6f bug CS-14695: Encrypt VNC password during 3.0.0 upgrade
status CS-14695: resolved fixed
reviewed-by: Abhi
2012-05-01 11:16:24 +05:30
prachi 9a4f5f90a2 Fix error from merge 2012-04-30 17:08:36 -07:00
Likitha Shetty 6ab04076b5 Implementation of api 'markDefaultZoneForAccount'(to enable a user to mark a zone as default for an account).
reviewed-by: prachi
2012-04-30 17:08:32 -07:00
prachi 38fffccb58 - Changes to EC2MainServlet to turn down request in enable.ec2.api is 'false'
- runInstances now calls CS to get the matching serviceOffering for the EC2 instanceType
2012-04-30 17:08:19 -07:00
prachi 1fa596fcf5 DeployVMCmd: Do not place the instance in default security group if groupId is provided 2012-04-30 17:07:30 -07:00
prachi 46ccc1ec79 Fixes related to
- DescribeImages
- Fix Vm current state in runInstances
- Set hypervisor to UserVm response in CloudStack
2012-04-30 17:07:28 -07:00
Alena Prokharchyk e5ed22f55f bug 14694: when select valid clusters, exclude the removed ones
status 14694: resolved fixed
2012-04-30 13:10:49 -07:00
Abhi 007f291235 adding a plaintext authenticator 2012-04-30 16:41:35 +05:30
Nitin Mehta 8de5da1c91 bug CS-10789: Decrement and increment the resource count on volume correctly. 2012-04-30 11:15:12 +05:30
Nitin Mehta 6a056ad139 bug CS-10789: More changes for the imageformat, introdueced new column in db for the format, created scripts for doffernt hypervisors ...and the list goes on. 2012-04-30 11:14:43 +05:30
Nitin Mehta cf0b36319d bug CS-10789: Make the custome disk offering as system so that its not availble to the regular user.
Reviewed By: Kishan
2012-04-30 11:13:01 +05:30
Nitin Mehta c2d51d7038 bug CS-10789: Adding more code changes for usage, delete volume . 2012-04-30 11:11:54 +05:30
Nitin Mehta 10b32ce882 bug CS-10789: Adding volume sync and delete functionality. 2012-04-30 11:11:26 +05:30
Nitin Mehta 8196132f68 bug CS-10789: Preliminary upload and attach changes work . 2012-04-30 11:09:37 +05:30
Nitin Mehta 2d7471adb5 Bug 10808: More changes for uploadVolume. Create framework for upload volume progress communication between MS and SSVM. 2012-04-30 09:46:23 +05:30
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