87855d6bb7
Fix a problem where virtual routers were deployed multiple times in a network
2015-03-16 11:38:11 +01:00
09bd847040
Vpc redundancy enabled. Including Vpc & Vpc Offering creation. Marvin tests and UI.
2015-03-16 11:38:05 +01:00
1237ded02e
Fix on error reporting (null doesn't say much, so lets return the actual problem)
2015-03-16 11:35:15 +01:00
843f6b1691
CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)
...
Added a source column to the user table.
Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.
When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.
added overloaded methods in AccountService to createUserAccount and
createUser with source specified.
(cherry picked from commit 5da733072e
2015-03-16 14:53:53 +05:30
3de5d9db5f
volume upload: Restart of MS leads to loss of browser uploaded templates
...
on restart of management server, template sync runs. It checks for
templates in ssvm using the uniquename. If it doesnt find any, cleans
the directory. In case of uploaded templates, these are getting saved
using name instead on uniquename and hence template sync cant find them
and does cleanup. Using uniquename in template.properties now.
2015-03-16 12:45:24 +05:30
2783cf540b
CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm.
...
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 659edb4d9b
2015-03-16 12:37:45 +05:30
5da733072e
CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)
...
Added a source column to the user table.
Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.
When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.
added overloaded methods in AccountService to createUserAccount and
createUser with source specified.
2015-03-16 12:35:37 +05:30
659edb4d9b
CLOUDSTACK-7348 InvalidParameter Exception while executing scale vm.
...
We do not throw the exceptions any more, so added info in the logs to say
what happend to this command.
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2015-03-16 12:34:43 +05:30
765622658a
Avoid distributing private key for realhostip.com
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d94a5720ef
2015-03-13 15:02:27 +05:30
6ccb9b1fc3
Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to.
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0d36f2e4b5
2015-03-13 15:02:26 +05:30
d94a5720ef
Avoid distributing private key for realhostip.com
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 13:33:48 +05:30
0d36f2e4b5
Error message exposes domain Id when deployVirtualMachine() is attempted on a shared network to which the user doesnot have access to.
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 12:47:56 +05:30
c27c69438b
hypervisors: add OVM3 plugin that supports OVM 3.2.1/3.3.x
...
This is a plugin that puts in ovm3 support ranging from 3.3.1 to 3.3.2. Basic
functionality is in here, advanced networking etc..
Snapshots only work when a VM is stopped now due to the semantics of OVM's raw
image implementation (so snapshots should work on a storage level underneath the
hypervisor shrug)
This closes #113
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-12 11:33:42 +05:30
47a22e0594
volume-upload: Unable to download template which has been uploaded via POST URL
...
During upload, POST url is saved in template_store_ref DB table. Now during download, same url is incorrectly returned back.
Fixed the code to cleanup POST url from DB on successful template upload.
2015-03-11 17:55:04 +05:30
05d2b0a707
server: remove unused import in ImageStoreJoinDaoImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-11 17:28:32 +05:30
2d00f9ede6
server: remove unused import in ImageStoreJoinDaoImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-11 17:26:50 +05:30
eca7f9cacc
CLOUDSTACK-8315: CS API listVMSnapshot doesn't have tags ‘project’ and ‘projectid’.
...
(cherry picked from commit 182d770f9f
2015-03-11 16:39:18 +05:30
40f343ff4c
api: avoid sending sensitive data in api response
...
- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 02cadc3fb3
2015-03-11 16:34:56 +05:30
02cadc3fb3
api: avoid sending sensitive data in api response
...
- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-11 16:34:11 +05:30
1dae3a4a13
volume-upload: Volume resource count is incremented even for failed and abandoned volumes
...
Added logic to clean up abandoned and failed volume uploads. This is done as part of storage GC.
2015-03-11 16:24:03 +05:30
182d770f9f
CLOUDSTACK-8315: CS API listVMSnapshot doesn't have tags ‘project’ and ‘projectid’.
2015-03-11 14:38:57 +05:30
5aedeb74f9
CLOUDSTACK-8312: The storage usage of "Primary Storage Allocated" is incorrect.
...
(cherry picked from commit 520d96724a
2015-03-11 13:07:47 +05:30
520d96724a
CLOUDSTACK-8312: The storage usage of "Primary Storage Allocated" is incorrect.
2015-03-10 16:52:25 +05:30
ec2639e8fb
CLOUDSTACK-8248: loadCidrs before sending response
...
Fixes regression from CLOUDSTACK-6582
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f9090eacd6
2015-03-06 21:44:28 +05:30
25b0bd620a
server: last cherry-picked commit failed to remove code
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-06 21:44:24 +05:30
f9090eacd6
CLOUDSTACK-8248: loadCidrs before sending response
...
Fixes regression from CLOUDSTACK-6582
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-06 21:43:24 +05:30
c8e6fbb812
kvm: Check the return value of the cloudstack-setup-agent command
...
Bug-Url: https://issues.apache.org/jira/browse/CLOUDSTACK-8016
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #93
(cherry picked from commit 7c1590ffd6
2015-03-04 16:56:48 +05:30
7c1590ffd6
kvm: Check the return value of the cloudstack-setup-agent command
...
Bug-Url: https://issues.apache.org/jira/browse/CLOUDSTACK-8016
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #93
2015-03-04 12:42:14 +05:30
b16520bcec
volume upload: added max size check for temaplte/volume post upload
...
used the existing configuration variables max.template.iso.size and
storage.max.volume.upload.size for templates and volumes respectively.
2015-03-03 17:27:40 +05:30
ed099c3f96
server: check and set sercure cookie flag only after login
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0f819f1583
2015-02-28 18:23:05 +05:30
0f819f1583
server: check and set sercure cookie flag only after login
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 18:20:56 +05:30
20bcb4b673
CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response
...
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b6b3494782
2015-02-28 18:14:49 +05:30
b6b3494782
CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response
...
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 18:12:37 +05:30
43cf1da865
CLOUDSTACK-5238: password checks, NPE fixes and minor fixes
...
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 5481485a08
2015-02-27 18:24:46 +05:30
5481485a08
CLOUDSTACK-5238: password checks, NPE fixes and minor fixes
...
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 18:20:10 +05:30
dd1a8da977
volume upload: Volume entry created in DB even though GetUpload* API fails with "No ssvm present" error
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2015-02-27 17:42:32 +05:30
a75ff23131
CLOUDSTACK-8273: fix baremetal account creation
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e000646790
2015-02-27 15:55:09 +05:30
e000646790
CLOUDSTACK-8273: fix baremetal account creation
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 15:52:25 +05:30
d8e1bf1506
CLOUDSTACK-7089: don't log VNC password
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd9
2015-02-26 18:11:12 +05:30
e287de9fd9
CLOUDSTACK-7089: don't log VNC password
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 18:10:23 +05:30
4dde4106c0
server: Add missing import, fixes build
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 17:49:55 +05:30
6df2fe7a8a
CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit cb08707add
2015-02-26 17:47:01 +05:30
cb08707add
CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 17:42:21 +05:30
e1827fc696
CLOUDSTACK-8285: check and update IP capacity states based on allocation state
...
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 985a61652e
2015-02-25 16:47:40 +05:30
985a61652e
CLOUDSTACK-8285: check and update IP capacity states based on allocation state
...
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-25 16:46:12 +05:30
4f9bc70b1f
CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b462a56f27
2015-02-25 14:30:13 +05:30
b462a56f27
CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-25 14:21:11 +05:30
dc870b5114
volume upload: Size is listed as zero for uploaded volumes
...
Updating the virtual size for template/volume when upload is completed.
2015-02-19 17:13:47 +05:30
075c841052
volume upload: cannot delete a volume in NotUploaded state Added exception handler in the upload status monitor thread.
2015-02-17 12:31:41 +05:30
d19ea5226a
volume upload: Use volume/template UUID instead of ID in UploadStatusCommand
2015-02-17 12:31:40 +05:30
b616894c21
volume upload: fixed issues during request validation
...
adding the encoded metadata to the signature
2015-02-17 11:50:58 +05:30
5c4fd12a9b
volume upload: using the timeout from configuration
...
removed the hardcoded 60 min
2015-02-17 11:33:29 +05:30
812a140d17
volume upload: returning only the first payload incase of templates
...
Cross zone copy will be intiated by the management server.
2015-02-17 11:32:40 +05:30
3814677977
volume upload: getUploadParamsForVolume url has IP address instead of hostname, SSL fails
2015-02-17 11:31:44 +05:30
2580edbcfb
CLOUDSTACK-7908: UserVmResponse returns userid/username information of the creator
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 16:12:22 +05:30
1a6df6f978
CLOUDSTACK-7908: Add user_id column to vm_instance table
...
Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+VM+listing+by+User+ID
- Adds column to VMInstance DAO
- Adds column in vm_instance table
- Adds column in the UserVMJoinVO
- Adds default admin user which has UID = 2
- Adds migration path that sets user_id to first user of the accountId that
owns the vm in vm_instance table
- Add arg on list VMs API to query by userId, add support in query layer
- Refactor VMInstanceVO and child classes to accept userId
- Add code to let service layer pass userId if loggedIn user belongs to same
account as the owner executing an API call or use first user from owner account
- In case of CPVM and SSVM use system user ID
- Fix unit tests and spring injections
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:02:38 +05:30
78bfaa79cf
Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences
...
(cherry picked from commit ef6ec7b276
2015-02-06 16:50:20 +05:30
405ed3ca50
CLOUDSTACK-7605: Fix basic zone multiple pod network restart with cleanup=true
...
1. getRouters() doesn't handle RestartNetwork with cleanup=true for basic zone,
because pod wouldn't be specific at the time.
2. The regression caused by the following fix. The variable "routers" was
overrided with some local values, result in only one of the routers in multiple
pods would return, thus only one router would be started.
commit 6dd5c3fd42aaeadc5c44
2015-02-06 16:44:19 +05:30
40e296dea4
CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume
...
(cherry picked from commit e427d0004c
2015-02-06 16:32:35 +05:30
4ea0dcda9b
CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented
...
(cherry picked from commit a8b89bea4f
2015-02-06 16:24:06 +05:30
54d08a8e29
CLOUDSTACK-8091: Stale entry exists for a VM NIC even after an exception while adding a new nic to vm
...
(cherry picked from commit 4821bfffe2
2015-02-06 16:19:46 +05:30
1cf165f86d
ApiResponseHelper: fix NPE when parent of snapshot is null
2015-02-05 17:10:56 +05:30
fae4fdae53
ApiResponseHelper: fix NPE when parent of snapshot is null
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 17:02:30 +05:30
7a397cd4ef
For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface
...
(cherry picked from commit 9eb8d538dd
2015-02-05 16:37:59 +05:30
c25263ba81
Fixed Coverity Issues
2015-02-05 15:59:29 +05:30
01cc1b816d
CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine
...
(cherry picked from commit 781648fb10
2015-02-05 15:22:21 +05:30
8ec6d0471c
CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events
...
(cherry picked from commit 50185b7c3a
2015-02-05 14:56:52 +05:30
6541354a59
Trigger user stats aggregation job at midnight in usage aggregation timezone
...
(cherry picked from commit 4ac96d637c
2015-02-05 14:33:27 +05:30
782adc106e
CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS
...
(cherry picked from commit 0f528df228
2015-02-05 13:50:29 +05:30
bd190192b9
Fixed Resource Leaks
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 350ac4c4b0
2015-02-05 13:47:22 +05:30
98b416b7f0
fixed NPE
...
(cherry picked from commit c78f14cbc2
2015-02-05 12:10:09 +05:30
b586439c9f
CLOUDSTACK-8197 create MinVRVersion config item
2015-02-03 13:18:15 +01:00
552f2ae60c
CLOUDSTACK-8191: SAML users should have their own accounts
...
(cherry picked from commit 876c78fe1b
2015-02-02 19:58:10 +05:30
876c78fe1b
CLOUDSTACK-8191: SAML users should have their own accounts
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 19:56:25 +05:30
0e4d91aa91
CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage
...
pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user.
(cherry picked from commit cffae8eef0
2015-02-02 14:36:07 +05:30
f00140243c
CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true.
...
During VM creation, if vm.instancename.flag is set to true and hypervisor type is VMware, check if VM with the same hostname already exists in the zone.
(cherry picked from commit 5f9e4fddf3
2015-02-02 14:30:18 +05:30
272f282a05
CLOUDSTACK-8119. Propagate error message to UI for attach/detach volume failure operations.
...
For AttachVolume/DetachVolume API command, improve user error message in case of RuntimeException by throwing the exception instead of 'Unexpected Exception'.
(cherry picked from commit 4d7ede535d
2015-02-02 13:57:38 +05:30
b9932a0129
CLOUDSTACK-8122. Handle NPE thrown during migration failures.
...
When migration fails instead of returning NULL, throw the exception.
(cherry picked from commit a5a65c7b55
2015-02-02 13:56:43 +05:30
bcbfe3bdee
CLOUDSTACK-8129. Cold migration of VM across VMware DCs leaves the VM behind in the source host.
...
If VM has been cold migrated across different VMware DCs, then unregister the VM from source host.
(cherry picked from commit 15b348632d
2015-02-02 13:51:47 +05:30
8f4aa23ae0
CLOUDSTACK-8127. VM name not displayed after attaching data disk to a VM.
...
If user hasn't supplied a display name for a VM, default it to VM name in listVolume response.
This behaviour is identical to listVirtualMachine response.
(cherry picked from commit ff7997a2b1
2015-02-02 13:01:33 +05:30
121ff19cba
volume-upload: Attaching uploaded volume to an instance failing while copying from secondary to primary storage
...
The volume/template size and install path was not getting updated properly.
The upload status response should return these properties on completion of upload.
2015-01-31 17:27:46 +05:30
6ff8752fd0
volume-upload: gc thread to clean partially uploaded files
...
Fixed multiple issues in the template code path
2015-01-31 17:25:19 +05:30
c9908d2678
volume-upload: management server polling and upload status from agent
...
Some more fixes to the polling logic
2015-01-31 17:10:46 +05:30
3e857bde08
volume-upload: management server polling and upload status from agent
...
Fixed some issues with the polling logic to handle scenarios when SSVM is destroyed/down.
Also changed the status of the volume_store_ref entries so that subsequent operations work fine.
2015-01-31 17:02:18 +05:30
5f16bf746b
When canceling maintenance mode, the logic was looking at the id field of the work object instead of the id field of the VM object.
2015-01-29 23:11:29 -07:00
31f67c2b3c
If the HypervisorType of a storage pool is Any, we need to retrieve hosts in the given zone for each HypervisorType.
2015-01-29 19:18:04 -07:00
bd6a89939d
Adding/updating comments around the volume's hypervisor snapshot reserve field
2015-01-29 15:50:42 -07:00
1b51bbbf74
Update hypervisor snapshot reserve for the root volume earlier than when it is currently being set
2015-01-29 13:01:51 -07:00
89ef9e709b
volume upload: updating the PSK if its null
2015-01-29 16:55:26 +05:30
8aa34d048a
Putting in an extra check to see if this volume is already attached to a VM
2015-01-26 17:25:17 -07:00
abf4e5c646
CLOUDSTACK-8181: Introducing a new allocator called firstfitleastconsumed. The purpose of this allocator is to find hosts/pools with least capacity usage (in terms of percentage) within the cluster and use those resources first before others. This allocator can be used changing vm.allocation.algorithm. For hosts it would decide the least consumed host through the setting host.capacityType.to.order.clusters to base the usage on cpu or ram.
...
Reviewed-by: Prachi
2015-01-26 10:48:06 -08:00
e474454c91
CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network
2015-01-26 16:57:46 +01:00
29aeed71fc
CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network
2015-01-26 16:54:53 +01:00
e5ffcab09d
Moving the call to getDeviceId(long, long) avoids a race condition when two volumes are being attached to a VM at the same time
2015-01-24 00:36:07 -07:00
f9a8111e17
CLOUDSTACK-8151: Add removeRawUsageRecords API to cleanup old cloud_usage data
...
Call removeRawUsageRecords with interval (> 0) and it will clean up cloud_usage
table by removing records older than interval no. of days from today (current date)
and in case it runs when the job exec time is near, it will fail alerting
user to try again after a 15 min window.
There is an issue with async job scheduler, if this API were async it tries
to search and remove job from cloud_usage.async_job table and fails which is
why this API is sync and extends BaseCmd.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-23 19:38:32 +05:30
0f84e042b9
Adding support for creating a volume from a snapshot when the snapshot is on managed storage
2015-01-20 15:24:33 -07:00
9cf05dc842
CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false
...
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
(cherry picked from commit c55bc0b2d1
2015-01-20 14:43:10 +05:30
45108fdbad
CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly
...
(cherry picked from commit fc4dceaa99
2015-01-20 14:38:03 +05:30
31a6517402
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic of setting source template id to create() method than execute which was wrongly put in.
...
(cherry picked from commit e1a993d37b
2015-01-20 12:07:42 +05:30
a6f9411b1e
CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.
...
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering
(cherry picked from commit ee0f0a1cff
2015-01-20 12:05:25 +05:30
be0882b19e
CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on explicit enabling/disabling of the host and remove the logic for changing it when cluster/pod/zone is enabled/disabled. Also add the logic in capacity checker thread so that previous changes finally get consistent with this new model and also its good to have it for sanity reasons.
...
(cherry picked from commit ade305be20
2015-01-20 11:58:04 +05:30
665aa6b522
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
...
(cherry picked from commit e87bb20d0c
2015-01-20 11:55:47 +05:30
a12ab8a2b3
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
...
(cherry picked from commit 3907bc6f9d
2015-01-20 11:55:36 +05:30
1aeaf4dcc9
CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to not connect, fix it and also make sure that template/volume sync are robust that exceptions do not cause ssvm agent disconnect issues.
...
(cherry picked from commit 5213401ace
2015-01-20 11:39:34 +05:30
6715c6ccfa
CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a ReverseProxy is there
...
(cherry picked from commit f0a4a639de
2015-01-20 11:32:09 +05:30
6e5b9da7d4
CLOUDSTACK-7962: Change state to Volume State
...
(cherry picked from commit c615aafd77
2015-01-20 11:30:05 +05:30
f88a34dabe
CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also
...
(cherry picked from commit 690a5ded35
2015-01-20 11:29:59 +05:30
b77cbea0f3
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
...
(cherry picked from commit d475b62838
2015-01-20 11:29:34 +05:30
57f5d51a11
CLOUDSTACK-7976 : Param validation for global params involving domain name
...
(cherry picked from commit 95ea203907
2015-01-20 10:36:11 +05:30
3cb4358270
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
(cherry picked from commit 960b7bbf74
2015-01-20 10:31:05 +05:30
37cdb4ecca
CLOUDSTACK-8054: No event generated on host maintenance mode is completed
...
Added events for host maintenance start and completion
(cherry picked from commit f6854bc984
2015-01-20 10:23:37 +05:30
15ae33a5b6
volume upload: refactored post upload command and used it during template registration
2015-01-20 09:24:14 +05:30
ad6b7b30cb
Volume upload: sending the nfsstore url in the metadata
...
decoding the metadata and deserialising it on receiving it
2015-01-19 18:04:14 +05:30
d8def3dc0b
CLOUDSTACK-8164: Look for all host to avoid NPE
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a1a601be5a
2015-01-19 11:30:49 +05:30
a1a601be5a
CLOUDSTACK-8164: Look for all host to avoid NPE
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-19 11:29:51 +05:30
7900ae5d9f
volume-upload: initializing state for volume and also setting the post url in volume_store_ref
2015-01-19 11:03:42 +05:30
1e87f3b80b
Bug-Id: CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM
...
(cherry picked from commit f767adfe71
2015-01-18 18:19:24 +05:30
5f117e6be9
CLOUDSTACK-6920 Support listing of LBHealthcheck policy with LBHealthcheck policy ID
...
(cherry picked from commit c7b23d0a10
2015-01-18 17:31:15 +05:30
a1791cb4a8
CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException
...
(cherry picked from commit 1df0453d27
2015-01-18 17:28:17 +05:30
8676ff26e0
CLOUDSTACK-8066: There is not way to know the size of the snapshot created.
...
(cherry picked from commit 9153b8bede
2015-01-18 17:25:41 +05:30
053c160b0f
volume upload: management server polling and upload status from agent
...
MS polling logic to query status for templates that are uploaded
2015-01-16 18:03:36 +05:30
1f1c96d2ee
volume upload: management server polling and upload status from agent
...
- Added config parameters for upload monitoring interval and operation timeout
- Some updates to the volume state machine
2015-01-16 15:28:17 +05:30
0eee9e8138
volume upload: removed the transition from IN-PROGRESS to ABONDONED
...
incase of timeout it moved to error state. ABONDONED state is only when
the user hasnt initiated the post request in the specified time
2015-01-16 12:50:42 +05:30
5028874e1c
under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py , and use isOnWindows function . thanks karuturi kindly tips.
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #66
2015-01-16 11:33:00 +05:30
4c30636c22
under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #66
2015-01-16 11:33:00 +05:30
71a0148565
CLOUDSTACK-7219: Fix NPE, log warning when config item is missing from scope
...
- Cherry picked from Daan's fix 63fbd16dd1188924751e
2015-01-15 19:19:46 +05:30
188924751e
CLOUDSTACK-7219: Fix NPE, log warning when config item is missing from scope
...
- Cherry picked from Daan's fix 63fbd16dd1
2015-01-15 19:13:40 +05:30
5ea7414746
move ConstantTimeComparator to utils
...
(cherry picked from commit b2393c31ed
2015-01-14 20:25:32 +05:30
162c5af6f8
Use constant-time comparison functions when checking signatures
...
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit 9b4e39e837
2015-01-14 20:25:21 +05:30
b2393c31ed
move ConstantTimeComparator to utils
2015-01-14 12:14:00 +01:00
9b4e39e837
Use constant-time comparison functions when checking signatures
...
This limits the likeliness of timing attacks against the API.
See http://codahale.com/a-lesson-in-timing-attacks/ for the
full rationale.
Conflicts:
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/user/AccountManagerImpl.java
2015-01-14 11:32:29 +01:00
627f5a62dc
volume upload: management server polling and upload status from agent
...
MS polling logic to query status for volumes that are uploaded
2015-01-14 10:19:12 +05:30
185f7e0152
CLOUDSTACK-8155: Remove unwanted whitespaces from json response
...
This removes extra whitespaces from the JSON serialized response.
After the fix, tested to work with:
- Present UI
- CloudMonkey
- Old buggy json parsers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 921ad057de
2015-01-14 02:43:54 +05:30
921ad057de
CLOUDSTACK-8155: Remove unwanted whitespaces from json response
...
This removes extra whitespaces from the JSON serialized response.
After the fix, tested to work with:
- Present UI
- CloudMonkey
- Old buggy json parsers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-14 02:40:00 +05:30
c2cf2503c1
volume upload: persisting the PSK only when its not present
2015-01-13 11:37:22 +05:30
1ae34d98d4
volume upload: fixed circular reference error while generating json
2015-01-13 10:41:39 +05:30
f767adfe71
Bug-Id: CLOUDSTACK-3439: Include dynamically created nics in Prepare for migration command in KVM
2015-01-07 14:52:42 +05:30
a520309190
Bug-Id: CLOUDSTACK-7395: reverted 0560254c04 partially. Allow multiple networks with LB service
2015-01-07 14:33:31 +05:30
01a325b2bf
Network Id for direct-network should not be included in usage record response. Direct network stats have network_id = 0. Ignore network with id = 0 in usage record
2015-01-07 14:17:30 +05:30
9eb8d538dd
For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface
2015-01-07 12:31:41 +05:30
4ac96d637c
Trigger user stats aggregation job at midnight in usage aggregation timezone
2015-01-07 11:17:24 +05:30
3cba1c41fb
CID-1114614 dead code removed
2015-01-06 16:47:32 +01:00
e8a54f471c
CID-1114606 use of MAX_VALUE and longValue() on Integer
2015-01-06 16:24:29 +01:00
1e8476d38a
CLOUDSTACK-8140: CS fails to start after secstorage/consoleproxy.service.offering is set to uuid
...
(cherry picked from commit 84c44b6314
2015-01-06 10:26:04 +01:00
84c44b6314
CLOUDSTACK-8140: CS fails to start after secstorage/consoleproxy.service.offering is set to uuid
2015-01-06 10:23:44 +01:00
93429443d5
CLOUDSTACK-8063: list secondary Ips information on non-default nics in VM response
2015-01-05 11:22:14 +01:00
c7b23d0a10
CLOUDSTACK-6920 Support listing of LBHealthcheck policy with LBHealthcheck policy ID
2014-12-26 21:01:03 +05:30
15b348632d
CLOUDSTACK-8129. Cold migration of VM across VMware DCs leaves the VM behind in the source host.
...
If VM has been cold migrated across different VMware DCs, then unregister the VM from source host.
2014-12-26 11:07:30 +05:30
ff7997a2b1
CLOUDSTACK-8127. VM name not displayed after attaching data disk to a VM.
...
If user hasn't supplied a display name for a VM, default it to VM name in listVolume response.
This behaviour is identical to listVirtualMachine response.
2014-12-24 15:21:34 +05:30
a5a65c7b55
CLOUDSTACK-8122. Handle NPE thrown during migration failures.
...
When migration fails instead of returning NULL, throw the exception.
2014-12-24 13:33:11 +05:30
4d7ede535d
CLOUDSTACK-8119. Propagate error message to UI for attach/detach volume failure operations.
...
For AttachVolume/DetachVolume API command, improve user error message in case of RuntimeException by throwing the exception instead of 'Unexpected Exception'.
2014-12-24 11:29:03 +05:30
5f9e4fddf3
CLOUDSTACK-8112. CS allows creation of VM's with the same Display name when vm.instancename.flag is set to true.
...
During VM creation, if vm.instancename.flag is set to true and hypervisor type is VMware, check if VM with the same hostname already exists in the zone.
2014-12-23 14:00:32 +05:30
106ec718fc
Revert "CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network"
...
This reverts commit 709bf074de
2014-12-23 12:13:51 +05:30
e0c495d357
Revert "CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network"
...
This reverts commit 0bd34d389f
2014-12-23 11:56:40 +05:30
788fe5a273
CLOUDSTACK-8103: Vmsync marks VM as stopped even after failing to stop it in HV
...
During vmsync if StopCommand (issued as part of PowerOff/PowerMissing report) fails to stop VM (since VM is running on HV),
don't transition VM state to "Stopped" in CS db. Also added a check to throw ConcurrentOperationException if vm state is not
"Running" after start operation.
2014-12-22 12:31:34 +05:30
331e257ca0
CLOUDSTACK-8103: Vmsync marks VM as stopped even after failing to stop it in HV
...
During vmsync if StopCommand (issued as part of PowerOff/PowerMissing report) fails to stop VM (since VM is running on HV),
don't transition VM state to "Stopped" in CS db. Also added a check to throw ConcurrentOperationException if vm state is not
"Running" after start operation.
2014-12-22 10:52:13 +05:30
c5d3a73c67
CLOUDSTACK-8101: volume sync not working as expected - MS restart during
...
upload volume leaves volume in hung state.
2014-12-19 16:43:02 -08:00
ea634550fc
CLOUDSTACK-8101: volume sync not working as expected - MS restart during upload volume leaves volume in hung state.
2014-12-19 15:51:52 -08:00
3e594c4e4f
volume upload: removed unused variables
2014-12-19 12:44:56 +05:30
3506789b0b
CLOUDSTACK-8093:Not able to list shared templates by passing id.
2014-12-18 10:27:20 -08:00
d304409c98
CLOUDSTACK-8093:Not able to list shared templates by passing id.
2014-12-18 10:00:18 -08:00
9bb6cf8452
volume upload: persisting the volume metadata
...
on calling GetUploadParamsForVolume, persisting the metadata to db
validating the account limits and incrementing the appropriate limits
encoded the metadata on management server using preshared key
2014-12-18 17:50:51 +05:30
4821bfffe2
CLOUDSTACK-8091: Stale entry exists for a VM NIC even after an exception while adding a new nic to vm
2014-12-18 17:45:34 +05:30
1df0453d27
CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException
2014-12-18 14:27:55 +05:30
1eb20ee095
if concurrent snapshot happening on the same vm, throw invalid parameter
...
exception to user.
Reviewed-by: Frank
2014-12-17 14:35:42 -08:00
b036c32bfc
if concurrent snapshot happening on the same vm, throw invalid parameter
...
exception to user.
Reviewed-by: Frank
2014-12-17 14:35:15 -08:00
8f2bd45660
if local storage is in maitenance mode or removed, won't change its
...
status in case of mgt server restart
Reviewed-by:Frank
2014-12-17 14:34:48 -08:00
b40d9c23fc
if local storage is in maitenance mode or removed, won't change its
...
status in case of mgt server restart
Reviewed-by:Frank
2014-12-17 14:34:23 -08:00
50d5d488d4
add event for volume migration
...
Reviewed-by: Frank
2014-12-17 14:33:54 -08:00
5a10a4725d
add event for volume migration
...
Reviewed-by: Frank
2014-12-17 14:33:06 -08:00
01ae7120ac
CLOUDSTACK-8078: [Automation] Deletion of Affinity Groups - CloudRuntimeException: No Event Pubish can be wrapped within DB Transaction!
...
Changes:
- The event of deleteing an affinity group is published on the MessageBus so that IAM Service can listen and process the event, However the publish operation should not be handled within a DB transaction, since it may take longer and hold the DB transaction for long unnecessarily
- Publish any events to MessageBus outside of the transaction
Conflicts:
server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
2014-12-17 13:53:11 -08:00
a7861aa5fa
CLOUDSTACK-8079: If the cluster capacity threshold is reached, HA-enabled VM is not migrated on another host during HA
...
Changes:
- When there is HA we try to redeploy the affected vm using regular planners and if that fails we retry using the special planner for HA (which skips checking disable threshold)
Now because of job framework the InsufficientCapacittyException gets masked and the special planners are not called. Job framework needs to be fixed to rethrow the correct exception.
- Also the VM Work Job framework is not setting the DeploymentPlanner to the VmWorkJob. So the HA Planner being passed by HAMgr was not getting used.
- Now the job framework sets the planner passed in by any caller of the VM Start operation, to the job
2014-12-17 13:48:24 -08:00
f5d4736c87
CLOUDSTACK-8079: If the cluster capacity threshold is reached, HA-enabled VM is not migrated on another host during HA
...
Changes:
- When there is HA we try to redeploy the affected vm using regular planners and if that fails we retry using the special planner for HA (which skips checking disable threshold)
Now because of job framework the InsufficientCapacittyException gets masked and the special planners are not called. Job framework needs to be fixed to rethrow the correct exception.
- Also the VM Work Job framework is not setting the DeploymentPlanner to the VmWorkJob. So the HA Planner being passed by HAMgr was not getting used.
- Now the job framework sets the planner passed in by any caller of the VM Start operation, to the job
2014-12-17 11:43:07 -08:00
74720830cd
CLOUDSTACK-8078: [Automation] Deletion of Affinity Groups - CloudRuntimeException: No Event Pubish can be wrapped within DB Transaction!
...
Changes:
- The event of deleteing an affinity group is published on the MessageBus so that IAM Service can listen and process the event, However the publish operation should not be handled within a DB transaction, since it may take longer and hold the DB transaction for long unnecessarily
- Publish any events to MessageBus outside of the transaction
2014-12-17 11:43:05 -08:00
9153b8bede
CLOUDSTACK-8066: There is not way to know the size of the snapshot created.
2014-12-17 16:00:19 +05:30
9fb654cbad
CLOUDSTACK-8077: Not able to deploy VM using a shared template.
2014-12-16 16:40:37 -08:00
cf1eed4811
CLOUDSTACK-8077: Not able to deploy VM using a shared template.
2014-12-16 16:39:56 -08:00
36c0c38ab8
volume upload: added the url validation check when url is not null
2014-12-16 15:41:27 +05:30
ff2ed33645
Fixed few coverity issues
2014-12-16 09:21:28 +01:00
f70a2a1486
volume upload: renamed command classes to follow the naming convention
2014-12-16 12:48:37 +05:30
7e030ee72d
volume upload: persisting the template metadata
...
on calling GetUploadParamsForTemplate, persisting the metadata to db
validating the account limits and incrementing the appropriate limits
encoded the metadata on management server using preshared key
2014-12-16 11:52:09 +05:30
aca0f79592
CLOUDSTACK-8072: Fixed NPE in deleting default ACL items in default ACL
2014-12-15 16:44:08 +05:30
85bb685662
CLOUDSTACK-8072: Fixed NPE in deleting default ACL items in default ACL
2014-12-15 16:37:35 +05:30
cdc66c9e70
Small typo correction, exisits -> exists
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #57
2014-12-15 11:26:19 +05:30
b07c9b7a9c
CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM
...
(cherry picked from commit 1115bc9cc6
2014-12-12 21:41:38 +05:30
aa92f5d483
Merge remote-tracking branch 'anshulg/CLOUDSTACK-8067'
...
This closes #56
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-12 21:40:21 +05:30
19e99848c8
CLOUDSTACK-7882: SSH Keypair Creation/Selection in UI
...
Thanks Ilia Shakitko for the porting and testing.
2014-12-12 14:30:34 +01:00
76dc20a0ee
CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
...
(cherry picked from commit c9d492d714
2014-12-12 11:15:08 +01:00
c9d492d714
CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider
2014-12-12 11:13:18 +01:00
fec31d53c3
CLOUDSTACK-8064: UpdatePortForwardingRuleCmd implementation
2014-12-12 10:19:06 +01:00
dcb7fcc6df
CLOUDSTACK-8063: list secondary Ips information in VM response
2014-12-12 09:47:27 +01:00
1115bc9cc6
CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM
2014-12-12 11:24:28 +05:30
fbe54974c5
CLOUDSTACK-8061: Extracting volume when it is in migrating state causes
...
both the operations to fail.
2014-12-11 11:36:34 -08:00
528bc80b4c
CLOUDSTACK-8061: Extracting volume when it is in migrating state causes
...
both the operations to fail.
2014-12-11 09:53:33 -08:00
f5619f428b
CLOUDSTACK-8051: fix NPE in updateNetwork due to static nat rules exist but no StaticNat provider
2014-12-11 15:13:36 +01:00
fdb782ffcb
CLOUDSTACK-8014: Fix NPE searching including removed templates
...
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE
Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8
2014-12-10 19:31:27 +05:30
e59dac201d
CLOUDSTACK-8014: Fix NPE searching including removed templates
...
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE
Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8
2014-12-10 19:30:56 +05:30
f6854bc984
CLOUDSTACK-8054: No event generated on host maintenance mode is completed
...
Added events for host maintenance start and completion
2014-12-10 10:18:34 +05:30
8278d88f76
CLOUDSTACK-8030: Updated router to come up egress default ALLOW
...
On default iptables rules are updated to add ACCEPT egress traffic.
If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
is egress default rule when there are no other egress rules.
If the CS network egress default policy is true, CS won't configure any default rule for egress because
router already came up to accept egress traffic. If there are already egress rules for network then the
egress rules get applied on VR.
For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
2014-12-10 10:13:41 +05:30
016d009adf
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
The last commit 513adab51b#1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
2014-12-09 11:46:45 +05:30
ef9830d6a4
Merge branch '4.5'
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
tools/appliance/build.sh
2014-12-09 14:59:36 +05:30
13205e6be1
CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes
2014-12-09 08:21:35 +01:00
05b2ec4f55
Merge branch 'hotfix/CID-1256277'
2014-12-08 12:40:08 +01:00
8f8e311110
CLOUDSTACK-8030: Updated router to come up egress default ALLOW
...
On default iptables rules are updated to add ACCEPT egress traffic.
If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
is egress default rule when there are no other egress rules.
If the CS network egress default policy is true, CS won't configure any default rule for egress because
router already came up to accept egress traffic. If there are already egress rules for network then the
egress rules get applied on VR.
For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
2014-12-08 11:32:01 +05:30
b1e4c6db07
Revert "Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.""
...
This reverts commit 24aaf19239
2014-12-08 11:20:49 +05:30
24aaf19239
Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured."
...
This reverts commit 39a671dfd8
2014-12-05 15:24:09 +05:30
2554cfb140
CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings
2014-12-05 08:42:22 +01:00
2d7f0c693b
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:55:41 +05:30
936a17be22
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:45:22 +05:30
7ef0f5507d
Attach volume events are not correctly shown in events.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 20:01:41 +05:30
fc1a09ff49
Add snapshotName parameter in CreateSnapshotCmd
2014-12-04 15:29:39 +01:00
d4605556c6
fix NPE when delete a domain
2014-12-04 15:28:41 +01:00
7b8fe0c8cd
Attach volume events are not correctly shown in events.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-12-04 19:31:03 +05:30
3c9e14e85a
CLOUDSTACK-5241: Remove Rot13 usage
2014-12-03 19:38:47 -08:00
feeafa76a4
CLOUDSTACK-5241: Remove Rot13 cipher
2014-12-03 19:30:31 -08:00
344d98e0bd
CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search.
2014-12-03 09:48:07 -08:00
8cb11f407f
CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search.
2014-12-03 09:33:22 -08:00
a81b59e2a4
Revert "some unused fields deleted"
...
This reverts commit 31db58f720
2014-12-03 18:09:49 +01:00
590667076d
CID-1256277 use StringBuffer in loop
2014-12-03 13:32:22 +01:00
c25d4fdea2
CLOUDSTACK-7847: Separate ListDomains cmd to use two different views
2014-12-03 12:33:57 +01:00
0407fb334f
CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response
2014-12-02 11:52:10 +01:00
b963bb1e6d
volume upload: added getUploadParamsForVolume and getUploadParamsForTemplate api
2014-12-02 12:15:42 +05:30
77c88fa917
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 19:03:23 -08:00
c987080c26
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 18:59:25 -08:00
c3515c9ff9
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 18:49:09 +05:30
513adab51b
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
2014-12-01 18:09:58 +05:30
af2f21894c
CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin
2014-12-01 13:03:37 +01:00
5241d0faf8
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab
2014-12-01 16:39:01 +05:30
1e0880cbab
CLOUDSTACK-7903: Fix build regression from previous fix
...
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 16:35:23 +05:30
e124781445
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2
2014-12-01 15:55:30 +05:30
9b907902d2
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-01 15:52:00 +05:30
d28b716d8a
CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers
...
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 21a6bef53b
2014-11-28 15:46:17 +05:30
21a6bef53b
CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers
...
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-28 15:43:29 +05:30
cdfdda2051
CLOUDSTACK-6075: Increase the ram size for router service offering
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488c17858f
2014-11-27 16:05:34 +05:30
488c17858f
CLOUDSTACK-6075: Increase the ram size for router service offering
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:04:59 +05:30
bf8dd828f5
CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
...
resource tags due to joining user_vm_details to user_vm_view.
2014-11-26 17:40:06 -08:00
4e7af26c9f
CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
...
resource tags due to joining user_vm_details to user_vm_view.
2014-11-26 17:23:07 -08:00
960b7bbf74
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
2014-11-26 15:08:48 -08:00
95ea203907
CLOUDSTACK-7976 : Param validation for global params involving domain name
2014-11-26 14:54:42 -08:00
86895ec13c
Add validation for domain names passed via global pamaremets
2014-11-26 14:45:50 -08:00
9585aa0b51
CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit eae733817b
2014-11-25 15:55:54 +05:30
02ca6f2e5b
CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8
2014-11-25 15:55:30 +05:30
7ff31f1b22
Merge remote-tracking branch 'origin/inetaddress'
...
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/api/ApiServlet.java
2014-11-25 14:32:09 +05:30
eae733817b
CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 12:22:31 +05:30
c919ff83d8
CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-25 11:55:43 +05:30
7175247c5e
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:30:32 -08:00
4e5b3d028d
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:27:56 -08:00
72ba98b1b8
Validate IPv4 address using Apache Commons Validator
2014-11-24 14:43:48 +01:00
87a7810ade
Fix UnitTest ApiServlet
2014-11-24 11:48:13 +01:00
d475b62838
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
2014-11-24 13:44:42 +05:30
c615aafd77
CLOUDSTACK-7962: Change state to Volume State
2014-11-24 12:08:58 +05:30
690a5ded35
CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also
2014-11-24 11:20:19 +05:30
31db58f720
some unused fields deleted
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:04 +01:00
712a729bd7
unused logger removed
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:03 +01:00
3577423da9
removed executable flags from java classes
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:01 +01:00
2a6d6891eb
Some simplification on getClientAddress in ApiServlet
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:58 +01:00
fa52ffad65
unit test for getClientAddress
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:57 +01:00
b85183ede7
CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong
...
url.
2014-11-21 15:18:47 -08:00
9ac93d3e43
CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url.
2014-11-21 14:36:36 -08:00
4bd49df3f5
Use InetAddress for passing Remote Address instead of String
2014-11-21 12:10:35 +01:00
9f8d0051ed
CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
...
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-21 03:39:57 -05:00
1be6fb143e
CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
...
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-21 03:38:52 -05:00
66e0f049db
CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
...
all the tags of all resources.
2014-11-20 09:48:07 -08:00
5fa7801b20
CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
...
all the tags of all resources.
2014-11-20 09:46:00 -08:00
7de9d2f002
Revert "BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying"
...
This reverts commit 3014fd0089
2014-11-20 09:44:55 -08:00
3014fd0089
BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying
...
all the tags of all resources.
Reviewed-by: Frank
2014-11-20 09:31:29 -08:00
8ea7902075
CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
...
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-11-20 03:46:03 -05:00
4140811549
CLOUDSTACK-7947:
...
double check if parent snapshot is removed or not, when creating new
snapshot
Reviewed-by: Min
2014-11-19 16:13:05 -08:00
bd79965329
CLOUDSTACK-7947:
...
double check if parent snapshot is removed or not, when creating new
snapshot
Reviewed-by: Min
2014-11-19 16:12:28 -08:00
2ccecce515
CLOUDSTACK-7946:
...
fix compile
2014-11-19 16:09:30 -08:00
15c0efb774
CLOUDSTACK-7946:
...
fix compile
2014-11-19 16:08:54 -08:00
d856a2acad
CLOUDSTACK-7946:
...
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
2014-11-19 16:08:27 -08:00
67113ff0b2
CLOUDSTACK-7946:
...
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
2014-11-19 16:06:37 -08:00
3da3d7418e
volume upload: PSK exchange between managemnet server and SSVM
...
generated a key during management server start and saved it in
configurationt table
2014-11-19 17:53:14 +05:30
f0a4a639de
CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a ReverseProxy is there
2014-11-19 16:07:10 +05:30
4e896938ee
BUG-ID: CLOUDSTACK-5324 when router requires upgrade throw ResourceUnavailableException with scope VirtualRouter. API willl return generic Network Unavailable error.
...
Reviewed-By: Damoder
2014-11-19 09:46:56 +05:30
968ca060ee
CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag
...
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
2014-11-18 14:07:51 -08:00
7f54894045
CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage.
...
Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan.
2014-11-18 14:07:49 -08:00
48553d7434
CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage.
...
Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan.
2014-11-18 09:47:20 -08:00
f2ccee7a03
name convention adherence
2014-11-18 16:52:46 +01:00
302d5195d4
Merge branch 'bugfix/CID-1254835'
2014-11-18 14:31:33 +01:00
e1d4a329c4
Package name should reflect the location on the filesystem or viseversa
2014-11-18 14:12:44 +01:00
9c328cb9dd
CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited
...
This closes #40
2014-11-18 14:25:30 +05:30
8307dd9105
CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float
...
This closes #41
2014-11-18 14:25:12 +05:30
4721e66d0e
CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue
...
This closes #28
2014-11-18 14:24:58 +05:30
44d12330b9
CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful
...
This closes #29
2014-11-18 14:24:47 +05:30
ae199b6ce7
CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop.
...
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
2014-11-18 14:12:45 +05:30
c04cdae60b
CLOUDSTACK-7767: fixed events are not generated for snapshot creation
2014-11-18 14:12:33 +05:30
f43ffb9a0f
CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
...
Now they are informed that they cannot perform the operation.
To perform operation they have to remove VM snapshots of VM.
2014-11-18 14:12:02 +05:30
ef30300281
CID-1254834 secStorageVm can only be null in a special case
2014-11-18 09:37:35 +01:00
8560cc3b01
CID-1254835 proxy can only be null in a special case
2014-11-18 09:30:37 +01:00
31876fb588
CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited
...
This closes #40
2014-11-18 13:39:08 +05:30
b008d78b57
CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float
...
This closes #41
2014-11-18 13:36:21 +05:30
7b9e4a820b
CID-1254842 use boxed constant instead of true
2014-11-17 14:59:47 +01:00
bb1ab33bb4
CID-1254841 removed unused var
2014-11-17 14:55:13 +01:00
3dc12f7b48
CID-1254843: var name changed to saolve c&p issue
2014-11-17 14:45:48 +01:00
efe47b0704
CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue
...
This closes #28
2014-11-17 16:34:26 +05:30
e8a47594da
CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful
...
This closes #29
2014-11-17 16:31:35 +05:30
2898f7d8d6
CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop.
...
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
This closes #30
2014-11-17 16:17:15 +05:30
3a4d70e696
Revert "Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1 "
...
This reverts commit d5b6fc4f0491ffaaa5a2
2014-11-17 16:05:32 +05:30
d5b6fc4f04
Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1
...
This closes #30
2014-11-17 15:55:17 +05:30
5213401ace
CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to not connect, fix it and also make sure that template/volume sync are robust that exceptions do not cause ssvm agent disconnect issues.
2014-11-14 16:19:10 -08:00
39a671dfd8
CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured.
2014-11-14 14:30:46 -08:00
e87bb20d0c
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
2014-11-14 13:35:40 -08:00
3907bc6f9d
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
2014-11-14 13:18:27 -08:00
7fd1e8e239
Merge branch '4.5'
2014-11-14 12:12:07 +05:30
cffae8eef0
CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage
...
pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user.
2014-11-14 11:19:19 +05:30
7e6ec2ce82
CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2014-11-14 10:31:46 +05:30
ade305be20
CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on explicit enabling/disabling of the host and remove the logic for changing it when cluster/pod/zone is enabled/disabled. Also add the logic in capacity checker thread so that previous changes finally get consistent with this new model and also its good to have it for sanity reasons.
2014-11-13 13:54:45 -08:00
92d4a41a69
CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
2014-11-13 09:55:49 -05:00
ef6ec7b276
Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences
2014-11-13 17:26:24 +05:30
fc4dceaa99
CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly
2014-11-13 17:01:06 +05:30
f585dd2661
CLOUDSTACK-7902: Account creation results in exception in logs
...
Event publish code was wrapped in transaction, moved it out
2014-11-13 16:11:53 +05:30
03e63a67e0
CLOUDSTACK-7902: Account creation results in exception in logs
...
Event publish code was wrapped in transaction, moved it out
2014-11-13 14:41:33 +05:30
2042660a68
Added a "long getUsedIops(StoragePool)" method to the PrimaryDataStoreDriver interface
2014-11-12 13:38:58 -07:00
95daa14e2a
CLOUDSTACK-7583: Fix NPE caused by previous commit
2014-11-12 16:54:20 +01:00
f1361796bf
CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-11-12 10:24:56 +05:30
50a3c0b2e3
CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-11-12 10:12:15 +05:30
edf1047a20
CLOUDSTACK-7706: Coverity defects
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-11-11 20:58:45 +05:30
840c2fda85
CLOUDSTACK-7583: Send VmStats to Graphite host when configured
...
This allows external processing of VmStats information without using
the usage server of CloudStack
Statistics are being send to Graphite using UDP and not TCP.
UDP is used to prevent the management server waiting for TCP timeouts
when the Graphite server is unavailable
2014-11-11 13:04:43 +01:00
2685ed36cc
CLOUDSTACK-7880: Creating shared network results in exception
...
This is due to event publish being wrapped in a transaction, moved it outside of transaction scope.
2014-11-11 16:35:20 +05:30
6d268db217
CLOUDSTACK-7880: Creating shared network results in exception
...
This is due to event publish being wrapped in a transaction, moved it outside of transaction scope.
2014-11-11 16:32:20 +05:30
d2f28ea3ae
CID-1251369: not null check changed to null check
2014-11-11 09:32:09 +01:00
c916f30574
CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events
2014-11-10 21:22:47 +05:30
c401dbc8f9
CLOUDSTACK-7871: allow VM and template details update using update APIs
...
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 97fa4a023e
2014-11-10 17:53:26 +05:30
97fa4a023e
CLOUDSTACK-7871: allow VM and template details update using update APIs
...
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-10 17:51:57 +05:30
709bf074de
CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
2014-11-10 16:06:58 +05:30
0bd34d389f
CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
2014-11-10 15:26:48 +05:30
781648fb10
CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine
2014-11-10 15:19:02 +05:30
310bb255ac
CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check
2014-11-10 15:07:13 +05:30
991d783e03
CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check
2014-11-10 14:30:42 +05:30
a8b89bea4f
CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented
2014-11-09 23:01:28 -08:00
54ec268b7e
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
2014-11-08 13:50:43 +05:30
e25de54b4c
CLOUDSTACK-7421
...
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
2014-11-08 13:50:15 +05:30
8378485e56
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
2014-11-08 13:46:54 +05:30
1c9775b0df
CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS.
2014-11-07 17:34:16 +05:30
330bd2748e
CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS.
2014-11-07 17:32:25 +05:30
9338abb6f3
Check to see if the Map<String, String> of capabilities passed back from the storage driver is null.
2014-11-06 19:49:44 -07:00
ebb96f5e2f
Handle the case where the volume a snapshot was created from is removed from the database
2014-11-06 19:44:46 -07:00
812b0122e2
CLOUDSTACK-7683: hold a db lock during vm expunge
2014-11-06 15:37:15 -08:00
ffdb38c496
there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min
2014-11-06 15:30:19 -08:00
1fb28c2959
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
2014-11-06 15:29:56 -08:00
103a4dd54d
CLOUDSTACK-7683: hold a db lock during vm expunge
2014-11-06 15:22:34 -08:00
92d9ef9c17
Handle the case where a snapshot is associated with a deleted volume
2014-11-06 15:34:39 -07:00
5a67fe7369
CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
...
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:44:54 +05:30
b844155240
CLOUDSTACK-7842: Wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
...
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:42:28 +05:30
4c5f792ca9
Merge branch '4.5'
2014-11-05 15:20:34 +05:30
c3e5964dcb
Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work
...
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.
Removed references of encryption check in different places.
Reviewed-by: Santhosh Edukulla
This closes #35
2014-11-05 11:49:38 +05:30
0327c2b13e
CLOUDSTACK-7421
...
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
2014-11-04 17:34:07 +05:30
9168d826da
CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
...
failed to migrate to the other host in the cluster.
Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
2014-11-04 17:28:22 +05:30
7a8f511014
CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
...
failed to migrate to the other host in the cluster.
Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
2014-11-04 16:46:28 +05:30
07ba078ee6
CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning
2014-11-03 11:19:06 -08:00
684889f0b5
CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning
2014-11-03 10:52:47 -08:00
e427d0004c
CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume
2014-11-03 17:20:21 +05:30
99010f463b
CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot
2014-11-03 17:20:00 +05:30
d6fdb7c6bc
CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access
2014-11-03 17:19:15 +05:30
1aef5cba66
Fixed Coverity Issues
2014-11-03 16:45:30 +05:30
1c01da3e08
CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events
2014-11-03 12:40:13 +05:30
efc9632c1b
CLOUDSTACK:6915 search including removed
2014-10-31 15:47:18 -07:00
6df396c9c0
Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5
2014-10-31 15:29:40 -07:00
0c153966e6
CLOUDSTACK:6915 search including removed
2014-10-31 15:29:07 -07:00
138366804d
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:25:06 -07:00
2652195010
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:24:32 -07:00
f543d86eff
saml: Use camelCase api names for SAML login/logout apis
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:39 +05:30
cd52bed477
saml: Use camelCase api names for SAML login/logout apis
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
62f9bf0fff
PR #26 CLOUDSTACK-7688, CLOUDSTACK-7747
...
Restricted various operations for VM with VM Snapshots #26
This closes #26
2014-10-30 15:11:57 +05:30
4705933a64
CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop.
...
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
2014-10-30 13:36:01 +05:30
d8b46b81b9
CLOUDSTACK-7767: fixed events are not generated for snapshot creation
2014-10-30 13:25:06 +05:30
a4d8215ebb
CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
...
Now they are informed that they cannot perform the operation.
To perform operation they have to remove VM snapshots of VM.
2014-10-30 12:37:50 +05:30
c78f14cbc2
fixed NPE
2014-10-29 17:05:42 -07:00
b6d8ceda3d
there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min
2014-10-30 02:21:29 -07:00
055901acda
CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
...
complete, slow compared to previous 4.3 release.
2014-10-27 17:00:42 -07:00
dd7026b20e
CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
...
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:49:30 -07:00
307a35a618
CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
...
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:46:01 -07:00
4f43839dae
CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
...
complete, slow compared to previous 4.3 release.
2014-10-27 16:27:17 -07:00
db6a0d65aa
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:26:06 +05:30
4f4595cef8
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:23:36 +05:30
c5fa7cc494
Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
...
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:59:59 +05:30
9bcf0e1bf6
Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
...
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:52:28 +05:30
32dc09f2c3
even xenserverinvestigator returns true, that means host is up, but XAPI may not work
2014-10-23 16:10:18 -07:00
10cc7f86af
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
2014-10-22 15:36:35 -07:00
4a13f81485
when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.
2014-10-22 15:14:46 -07:00
c52e14730e
when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA.
2014-10-22 15:07:40 -07:00
ee0f0a1cff
CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.
...
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering
2014-10-22 15:03:25 -07:00
97aa02ceb0
Commits related to taking snapshots that live on primary storage
2014-10-22 12:44:33 -06:00
0141b37784
CLOUDSTACK-7761:
...
Revert "when system VM ping times out, stop system VM"
This reverts commit ee23be1942
2014-10-21 17:21:17 -07:00
70112bd145
CLOUDSTACK-7761:
...
Revert "when system VM ping times out, stop system VM"
This reverts commit ee23be1942
2014-10-21 17:19:57 -07:00
57dacf99a2
Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
...
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
2014-10-21 16:01:14 -06:00
06f6b00cd1
Snapshot support
2014-10-21 16:01:13 -06:00
e1a993d37b
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic of setting source template id to create() method than execute which was wrongly put in.
2014-10-21 09:57:02 -07:00
a72580def0
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.
...
(cherry picked from commit 287ff83552
2014-10-20 16:50:22 -07:00
287ff83552
CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.
2014-10-20 16:49:48 -07:00
1de0cb7094
restore barematel work after merge
2014-10-17 10:24:01 +02:00
148efbb73f
Merge remote-tracking branch 'origin/4.5' into merge-master
...
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
setup/db/db/schema-441to450.sql
test/integration/component/test_deploy_vgpu_vm.py
tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
1f8cf0bee4
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:38:33 +05:30
ec6a666855
Config value having different category in SQL and Config.java.
2014-10-16 14:38:23 +05:30
420d4e0da0
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:25:30 +05:30
5025071954
Config value having different category in SQL and Config.java.
2014-10-16 14:01:23 +05:30
80e0c99189
Removed duplicate code and unused imports which was causing build failure.
2014-10-16 13:53:32 +05:30
efe1e0a544
Fixed coverity and other resource leak issues
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-16 12:19:51 +05:30
53ee4cd794
CLOUDSTACK-7728: Removed duplicate import
2014-10-16 10:05:06 +05:30
7fe3c45142
CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response
2014-10-16 09:43:04 +05:30
e257c13f16
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:38:21 +05:30
f488a8f72c
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:38:21 +05:30
080bc2e2e9
CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:38:21 +05:30
55e11cddca
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:37:43 +05:30
7cd3438580
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:37:42 +05:30
6967c6c229
CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:37:42 +05:30
3b442acdd7
CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
...
(cherry picked from commit 42f628c61c
2014-10-15 13:58:22 -07:00
42f628c61c
CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
2014-10-15 13:53:39 -07:00
e70dde09c9
Implementing snapshot-strategy support for reverting a volume to a snapshot
2014-10-14 22:04:18 -06:00
35a8b70799
Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage)
2014-10-14 12:26:40 -06:00
771d052381
Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack
2014-10-14 20:14:50 +02:00
1e87d7b266
Fixing checkstyle.
...
Making local variable compatible with our checkstyle settings.
2014-10-14 15:25:50 +02:00
2ed64b2356
Applying fix from commit id 6b8e0baa21
...
Changes by Edilson Su: if vpc public network with snat enabled, then will triger this issue.
2014-10-14 15:10:14 +02:00
db86bdfb2c
Applygin fix from commit ID aaeadc5c44
...
Sheng Yang changed 2 classes, ut only one was related to the bug CLOUDSTACK-7605.
I applied the changed on the routerslist, used during the deployment of the virtual routers.
Tested Advanced Zone against the simulator. 69 happy tests in place
2014-10-14 15:08:13 +02:00
c81b3380df
Applying the latest chances from the VPC Refactor branch onto the new one.
...
We will keep this branch as clean as possible to avoid problems with merge.
2014-10-14 15:08:13 +02:00
3ac2e222e8
CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2 by Frank Zhang
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:13 +02:00
4e21948f5c
Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap.
...
When the refactor took place, we should have changed first structure, then behaviour. By refactoring the deployRouter method
we changed how the templateName was retrieved.
Fixed and tested using the simulator and the following Marvin tests
test_privategateway_acl
test_routers
test_vpc_vpn
test_service_offerings
test_volumes
test_reset_vm_on_reboot
test_multipleips_per_nic
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:12 +02:00
025ff72410
fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:12 +02:00
9f801d1f3a
Changing the way the DAOs were being injected in the RuleApplier;
...
Making code clearer and simple.
Conflicts:
server/src/com/cloud/network/rules/PrivateGatewayRules.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-14 15:08:12 +02:00
60eea3bb1a
Adding fixes for the add user data and vpn rules
2014-10-14 15:08:11 +02:00
f2f4732854
Removing the VirtualNetworkStatus, it was not being used properly;
...
fixing the injection of the network DAO in the PrivateGatewayRules;
all tests that were failing in Travis have been tested before the commit.
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:11 +02:00
dc5fefc018
making sure the instance variable _router in the Rules is being used instead of the parameter
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:11 +02:00
64eed6c6ab
Fix: VpcRouter has always PublicIp setup as it did before refactoring
2014-10-14 15:08:10 +02:00
ee9068b5b2
merging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo
...
Conflicts:
server/src/com/cloud/network/rules/DhcpRules.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
2014-10-14 15:08:10 +02:00
b7c193a88d
fixing nic plug unplug rule
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-14 15:08:10 +02:00
5f51a06e3c
fix dhcp subnet rules. we can create VMs again.
2014-10-14 15:08:10 +02:00
02c75251b3
Fixing NPE due to use of dependencies before Spring injection
2014-10-14 15:08:09 +02:00
cd8cadaf9c
Refactor hypervisor retrieval from VpcNwHelper and NwHelper
...
Conflicts:
server/src/com/cloud/network/router/NetworkHelperImpl.java
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:08:09 +02:00
65fb21647a
auto wire the network helper
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:08:09 +02:00
546e563c27
refactor all private methods in the virtual router appliance and VPC appliance
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/com/cloud/network/rules/RuleApplier.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:08:09 +02:00
b5e96af4e2
Missing license headers
2014-10-14 15:02:14 +02:00
2802d3b75b
Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers
2014-10-14 15:02:14 +02:00
e08cb11fc0
fixing check style issues
...
Conflicts:
server/src/com/cloud/network/element/VpcVirtualRouterElement.java
server/src/com/cloud/network/rules/AdvancedVpnRules.java
server/src/com/cloud/network/rules/RuleApplier.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:02:14 +02:00
01edc8e394
adding setupPrivateGateway to new style;
...
removing methods from Vpc appliance;
changing the way VpcElement calls the command;
there is still work tob e done with the destroyPrivateGateway rule.
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:02:13 +02:00
b9bff843c6
Whole router.deployment package got 97% coverage
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:13 +02:00
3d4ddb7251
DeployRouter includes nw creation following TellDontAsk principle
...
Also factor out NicProfile specific methods and fix some DI config.
Conflicts:
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:13 +02:00
adebaf2bd0
adding applyStaticRoutes to the new visitor pattern.
2014-10-14 15:02:13 +02:00
b96035f356
adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance.
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-14 15:02:12 +02:00
2da3ceda31
Refactor to include network creation as actual deployment
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
2014-10-14 15:02:12 +02:00
00dc8a7b24
fixing check styles
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:02:12 +02:00
16ad4122b4
moving sendCommand to the NetworkGeneralHelper;
...
adding handle single network method to the NetworkGeneralHelper;
moving getRealPriority to the NetworkGeneralHelper;
making priority constants part of the VirtualNetworkApplianceManager;
changing the network topology implementation in order to use the NetworkGeneralManager instead of the appliance
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:02:11 +02:00
0d81cf09f6
Increasing test coverage for Vpc Deployment
2014-10-14 15:01:16 +02:00
240a539d43
Factor out prepareDeployment and update tests
2014-10-14 15:01:16 +02:00
d2d9157ab0
Complete tests for normal deployment and start vpc one
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
2014-10-14 15:01:16 +02:00
12b0d188cb
Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;
...
Implement the missing commands related to DHCP PV Lan and DHCP SubNet
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/DhcpRules.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-14 15:01:16 +02:00
a83f5790eb
License headers
2014-10-14 15:01:15 +02:00
6fac12675d
More refactoring and testing in the same classes
...
Conflicts:
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
2014-10-14 15:01:15 +02:00
f3c04172a4
RouterDeployment and VPC. Improving code and Unit Testing
2014-10-14 15:01:14 +02:00
Hugo Trippaers
Antonio Fornie
Sander Botman
Rajani Karuturi
Bharat Kumar
Nitin Mehta
Min Chen
Funs
Koushik Das
Rohit Yadav
Sanjay Tripathi
Laszlo Hornyak
Santhosh Edukulla
Sheng Yang
Kishan Kavala
Saksham Srivastava
Damodar
Rajesh Battala
Anthony Xu
Daan Hoogland
Devdeep Singh
Likitha Shetty
Mike Tutkowski
Harikrishna Patnala
amoghvk
Abhinandan Prateek
cloudtrends
Pierre-Yves Ritschard
Wei Zhou
Edison Su
Prachi Damle
Jayapal
Sebastien Goasguen
Anshul Gangwar
Daan Hoogland
Ilia Shakitko
Daniel Vega
Wido den Hollander
Syed
Will Stevens
wilderrodrigues