8120 Commits

Author SHA1 Message Date
Kishan Kavala
619674e21e CLOUDSTACK-5656: Rules will remain in Revoked state when router upgrade is required. Filtered revoked rules while listing. Show genreric error since router is not visible to enduser.
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-01-02 15:08:49 +05:30
Kishan Kavala
700184f3ba Added config to enable/disable router version check 2014-01-01 17:32:00 +05:30
Kishan Kavala
79dc74dcb8 CLOUDSTACK-5698: support network ACL list search by keyword
Conflicts:
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
2014-01-01 16:59:52 +05:30
Daan Hoogland
2cf356e047 isSameIsolationId 2013-12-31 12:25:17 +01:00
Murali Reddy
14241ce233 CLOUDSTACK-5667: Shared Network - fails to launch router due to "
Multiple generic soure NAT IPs provided for network"

'getExistingSourceNatInNetwork' method was retruning source nat ip for
a particular account, resulting in multiple source nat ip's to be
assigned to a shared network on network implemen. Fix ensures that
account id is not considered for shared network implement.
2013-12-31 11:09:57 +05:30
Sanjay Tripathi
db8d5f602a CLOUDSTACK-5422: Changing XenServer Tools Version 6.1 + doesnt work. 2013-12-30 20:01:06 +05:30
Sanjay Tripathi
a782d17caa CLOUDSTACK-3806: OS Preference can not be set. 2013-12-30 20:01:06 +05:30
Sanjay Tripathi
f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Devdeep Singh
40a9909864 Fix check style errors 2013-12-27 16:39:29 +05:30
Rajesh Battala
dcf8ddfb24 CLOUDSTACK-5340 [Hyper-V] Control IPs are not getting released when VRs are in stopped state 2013-12-27 14:56:02 +05:30
Rajesh Battala
ab304d2821 CLOUDSTACK-5592
ssh should run on eth1 interface in ssvm/cpvm running in HyperV.
2013-12-27 14:50:08 +05:30
Rajesh Battala
18fd0157a5 CLOUDSTACK-5365 added route for mgmt cidr in the VR running on HyperV 2013-12-27 14:46:28 +05:30
Murali Reddy
8b151c98c2 CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
restart, firewall rules dropped from iptables post restart

on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-27 14:27:57 +05:30
Prachi Damle
b7c3411be9 Fixing the issues in loading the beans 2013-12-26 15:17:10 -08:00
Min Chen
6f800506fd CLOUDSTACK-5653:S3 object store as Secondary Storage, the template
created from different zone is not available for the other zones.
2013-12-26 14:48:21 -08:00
Alena Prokharchyk
526af5e326 Included guestOsId to userVmResponse - as we let to change this param through updateVm call, we should return it in the response 2013-12-26 13:28:29 -08:00
Bharat Kumar
fead6706ff CLOUDSTACK-5530 attempt to add secondary storage with the same name is ignored 2013-12-26 12:43:44 -08:00
Min Chen
5d262d7b59 CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
migration to S3.
2013-12-26 12:39:39 -08:00
Jayapal
16763be77f Fixed issue in setting vm ip,mac in vm_instance table
This issue is not seen in 4.2, It is observed only in 4.3.
2013-12-26 16:58:04 +05:30
Devdeep Singh
c75f8bcc06 CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
Alena Prokharchyk
03226ba539 Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm 2013-12-24 15:34:43 -08:00
Kishan Kavala
435aefec15 CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be applied when VR is upgraded 2013-12-24 18:13:50 +05:30
Alena Prokharchyk
914bc46484 CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation 2013-12-23 16:28:06 -08:00
Alena Prokharchyk
fbba17e68c Resource metadata support for cloudStack user 2013-12-23 14:25:07 -08:00
Alena Prokharchyk
79e64aa535 Resource metadata support for Disk Offering 2013-12-23 12:36:13 -08:00
Kishan Kavala
cca60cd86d fix network ACL unit test 2013-12-23 17:27:16 +05:30
Kishan Kavala
0335009a1e CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status 2013-12-23 17:15:21 +05:30
Kishan Kavala
55d84bdd5f CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version 2013-12-23 17:15:03 +05:30
Devdeep Singh
34894f5a9d CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.
2013-12-23 17:06:11 +05:30
Min Chen
630b7fb4a1 Fix listTemplates issues with new ACL model. 2013-12-20 17:57:44 -08:00
Nitin Mehta
83bbe682d9 CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
Nitin Mehta
edc1b78d84 Revert "Revert "CLOUDSTACK-5281:""
This reverts commit ab37009e9015e90f39f001dbc7023ce52319dcff.
2013-12-20 17:30:05 -08:00
Alex Huang
ab37009e90 Revert "CLOUDSTACK-5281:"
This reverts commit 6b62a04eaf1196ebcce5e81c29c9e0f59dd4f858.
2013-12-20 17:23:33 -08:00
Alex Huang
c2baed665b Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies 2013-12-20 17:21:34 -08:00
Nitin Mehta
6b62a04eaf CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
Nitin Mehta
f083f91b0b CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Alena Prokharchyk
1832cf6660 CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet. 2013-12-20 13:39:13 -08:00
Edison Su
179cdea8e9 CLOUDSTACK-5596: reload vm state after vm been force stopped
Conflicts:

	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
Daan Hoogland
7b0c85da3c CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null 2013-12-20 13:46:58 +01:00
Edison Su
8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
edison su
02ace3442d 0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to- 2013-12-19 13:35:21 -08:00
Harikrishna Patnala
227567cf6c CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value 2013-12-19 22:56:34 +05:30
Harikrishna Patnala
707da55fe3 CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
Nitin Mehta
13ba5e45a1 CLOUDSTACK-4941:
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 18:56:12 -08:00
Nitin Mehta
1c0b8db01b CLOUDSTACK-4941:
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Kelven Yang
3c965d0685 CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations 2013-12-18 16:14:07 -08:00
Min Chen
afcf967d24 Revert "CLOUDSTACK-4941:"
This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2 CLOUDSTACK-4941:
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Prachi Damle
ce774e184e Fixing the management server startup 2013-12-18 14:14:55 -08:00
Kishan Kavala
cc27a740dc CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
Conflicts:
	server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30