Jayapal
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
Koushik Das
016d009adf
CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash
...
The last commit 513adab51b didn't fully fix it. Scenario #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
Koushik Das
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
Wei Zhou
13205e6be1
CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes
2014-12-09 08:21:35 +01:00
Daan Hoogland
05b2ec4f55
Merge branch 'hotfix/CID-1256277'
2014-12-08 12:40:08 +01:00
Jayapal
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
Nitin Mehta
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
Nitin Mehta
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
Wei Zhou
2554cfb140
CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings
2014-12-05 08:42:22 +01:00
Jayapal
2d7f0c693b
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:55:41 +05:30
Jayapal
936a17be22
CLOUDSTACK-8027: Update error msg for enable static nat
2014-12-05 12:45:22 +05:30
Damodar
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
Wei Zhou
fc1a09ff49
Add snapshotName parameter in CreateSnapshotCmd
2014-12-04 15:29:39 +01:00
Wei Zhou
d4605556c6
fix NPE when delete a domain
2014-12-04 15:28:41 +01:00
Damodar
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
Sheng Yang
3c9e14e85a
CLOUDSTACK-5241: Remove Rot13 usage
2014-12-03 19:38:47 -08:00
Sheng Yang
feeafa76a4
CLOUDSTACK-5241: Remove Rot13 cipher
2014-12-03 19:30:31 -08:00
Min Chen
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
Min Chen
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
Laszlo Hornyak
a81b59e2a4
Revert "some unused fields deleted"
...
This reverts commit 31db58f720 .
2014-12-03 18:09:49 +01:00
Daan Hoogland
590667076d
CID-1256277 use StringBuffer in loop
2014-12-03 13:32:22 +01:00
Wei Zhou
c25d4fdea2
CLOUDSTACK-7847: Separate ListDomains cmd to use two different views
2014-12-03 12:33:57 +01:00
Wei Zhou
0407fb334f
CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response
2014-12-02 11:52:10 +01:00
Rajani Karuturi
b963bb1e6d
volume upload: added getUploadParamsForVolume and getUploadParamsForTemplate api
2014-12-02 12:15:42 +05:30
Sheng Yang
77c88fa917
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 19:03:23 -08:00
Sheng Yang
c987080c26
CLOUDSTACK-7999: Always override local keystore file with the entry in DB
2014-12-01 18:59:25 -08:00
Koushik Das
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
Koushik Das
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
Wei Zhou
af2f21894c
CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin
2014-12-01 13:03:37 +01:00
Rohit Yadav
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 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 16:39:01 +05:30
Rohit Yadav
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
Ilia Shakitko
e124781445
CLOUDSTACK-7903: Decreased minimal usage aggregation range value
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 15:55:30 +05:30
Ilia Shakitko
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
Rohit Yadav
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 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-28 15:46:17 +05:30
Rohit Yadav
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
Harikrishna Patnala
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 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-27 16:05:34 +05:30
Harikrishna Patnala
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
Min Chen
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
Min Chen
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
amoghvk
960b7bbf74
CLOUDSTACK-7977
...
Fix password generator, add guards for minimum length
2014-11-26 15:08:48 -08:00
amoghvk
95ea203907
CLOUDSTACK-7976 : Param validation for global params involving domain name
2014-11-26 14:54:42 -08:00
amoghvk
86895ec13c
Add validation for domain names passed via global pamaremets
2014-11-26 14:45:50 -08:00
Harikrishna Patnala
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
Daniel Vega
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
Rohit Yadav
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
Harikrishna Patnala
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
Daniel Vega
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
Edison Su
7175247c5e
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:30:32 -08:00
Edison Su
4e5b3d028d
CLOUDSTACK-7966:
...
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
2014-11-24 14:27:56 -08:00
Wido den Hollander
72ba98b1b8
Validate IPv4 address using Apache Commons Validator
2014-11-24 14:43:48 +01:00
Wido den Hollander
87a7810ade
Fix UnitTest ApiServlet
2014-11-24 11:48:13 +01:00
Sanjay Tripathi
d475b62838
CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits.
2014-11-24 13:44:42 +05:30
Saksham Srivastava
c615aafd77
CLOUDSTACK-7962: Change state to Volume State
2014-11-24 12:08:58 +05:30
Saksham Srivastava
690a5ded35
CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also
2014-11-24 11:20:19 +05:30
Laszlo Hornyak
31db58f720
some unused fields deleted
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:04 +01:00
Laszlo Hornyak
712a729bd7
unused logger removed
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:03 +01:00
Laszlo Hornyak
3577423da9
removed executable flags from java classes
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:49:01 +01:00
Laszlo Hornyak
2a6d6891eb
Some simplification on getClientAddress in ApiServlet
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:58 +01:00
Laszlo Hornyak
fa52ffad65
unit test for getClientAddress
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-11-23 19:48:57 +01:00
Min Chen
b85183ede7
CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong
...
url.
2014-11-21 15:18:47 -08:00
Min Chen
9ac93d3e43
CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url.
2014-11-21 14:36:36 -08:00
Wido den Hollander
4bd49df3f5
Use InetAddress for passing Remote Address instead of String
2014-11-21 12:10:35 +01:00
Syed
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
Will Stevens
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
Min Chen
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
Min Chen
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
Min Chen
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
Min Chen
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
Syed
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
Edison Su
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
Edison Su
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
Edison Su
2ccecce515
CLOUDSTACK-7946:
...
fix compile
2014-11-19 16:09:30 -08:00
Edison Su
15c0efb774
CLOUDSTACK-7946:
...
fix compile
2014-11-19 16:08:54 -08:00
Edison Su
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
Edison Su
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
Rajani Karuturi
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
Saksham Srivastava
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
Kishan Kavala
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
Prachi Damle
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
Prachi Damle
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
Prachi Damle
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
Daan Hoogland
f2ccee7a03
name convention adherence
2014-11-18 16:52:46 +01:00
Hugo Trippaers
302d5195d4
Merge branch 'bugfix/CID-1254835'
2014-11-18 14:31:33 +01:00
Hugo Trippaers
e1d4a329c4
Package name should reflect the location on the filesystem or viseversa
2014-11-18 14:12:44 +01:00
Anshul Gangwar
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
Anshul Gangwar
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
Anshul Gangwar
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
Anshul Gangwar
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
Anshul Gangwar
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
Anshul Gangwar
c04cdae60b
CLOUDSTACK-7767: fixed events are not generated for snapshot creation
2014-11-18 14:12:33 +05:30
Anshul Gangwar
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
Hugo Trippaers
ef30300281
CID-1254834 secStorageVm can only be null in a special case
2014-11-18 09:37:35 +01:00
Hugo Trippaers
8560cc3b01
CID-1254835 proxy can only be null in a special case
2014-11-18 09:30:37 +01:00
Anshul Gangwar
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
Anshul Gangwar
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
Daan Hoogland
7b9e4a820b
CID-1254842 use boxed constant instead of true
2014-11-17 14:59:47 +01:00
Daan Hoogland
bb1ab33bb4
CID-1254841 removed unused var
2014-11-17 14:55:13 +01:00
Daan Hoogland
3dc12f7b48
CID-1254843: var name changed to saolve c&p issue
2014-11-17 14:45:48 +01:00
Anshul Gangwar
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
Anshul Gangwar
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
Anshul Gangwar
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
Rajesh Battala
3a4d70e696
Revert "Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1 "
...
This reverts commit d5b6fc4f04 , reversing
changes made to 91ffaaa5a2 .
2014-11-17 16:05:32 +05:30
Rajesh Battala
d5b6fc4f04
Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1
...
This closes #30
2014-11-17 15:55:17 +05:30
Nitin Mehta
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
Nitin Mehta
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
Nitin Mehta
e87bb20d0c
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
2014-11-14 13:35:40 -08:00
Nitin Mehta
3907bc6f9d
CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
2014-11-14 13:18:27 -08:00
Jayapal
7fd1e8e239
Merge branch '4.5'
2014-11-14 12:12:07 +05:30
Devdeep Singh
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
Damodar
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
Nitin Mehta
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
Will Stevens
92d4a41a69
CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
2014-11-13 09:55:49 -05:00
Santhosh Edukulla
ef6ec7b276
Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences
2014-11-13 17:26:24 +05:30
Saksham Srivastava
fc4dceaa99
CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly
2014-11-13 17:01:06 +05:30
Koushik Das
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
Koushik Das
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
Mike Tutkowski
2042660a68
Added a "long getUsedIops(StoragePool)" method to the PrimaryDataStoreDriver interface
2014-11-12 13:38:58 -07:00
Wido den Hollander
95daa14e2a
CLOUDSTACK-7583: Fix NPE caused by previous commit
2014-11-12 16:54:20 +01:00
Damodar
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
Damodar
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
Harikrishna Patnala
edf1047a20
CLOUDSTACK-7706: Coverity defects
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-11-11 20:58:45 +05:30
Wido den Hollander
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
Koushik Das
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
Koushik Das
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
Daan Hoogland
d2f28ea3ae
CID-1251369: not null check changed to null check
2014-11-11 09:32:09 +01:00
Santhosh Edukulla
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
Rohit Yadav
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 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-10 17:53:26 +05:30
Rohit Yadav
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
Jayapal
709bf074de
CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
2014-11-10 16:06:58 +05:30
Jayapal
0bd34d389f
CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network
2014-11-10 15:26:48 +05:30
Damodar
781648fb10
CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine
2014-11-10 15:19:02 +05:30
Bharat Kumar
310bb255ac
CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check
2014-11-10 15:07:13 +05:30
Bharat Kumar
991d783e03
CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check
2014-11-10 14:30:42 +05:30
Nitin Mehta
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
Koushik Das
54ec268b7e
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
2014-11-08 13:50:43 +05:30
Koushik Das
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
Koushik Das
8378485e56
CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
2014-11-08 13:46:54 +05:30
Sanjay Tripathi
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
Sanjay Tripathi
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
Mike Tutkowski
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
Mike Tutkowski
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
Edison Su
812b0122e2
CLOUDSTACK-7683: hold a db lock during vm expunge
2014-11-06 15:37:15 -08:00
Edison Su
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
Edison Su
1fb28c2959
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
2014-11-06 15:29:56 -08:00
Edison Su
103a4dd54d
CLOUDSTACK-7683: hold a db lock during vm expunge
2014-11-06 15:22:34 -08:00
Mike Tutkowski
92d9ef9c17
Handle the case where a snapshot is associated with a deleted volume
2014-11-06 15:34:39 -07:00
Sanjay Tripathi
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
Sanjay Tripathi
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
Rajani Karuturi
4c5f792ca9
Merge branch '4.5'
2014-11-05 15:20:34 +05:30
Rajani Karuturi
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
Koushik Das
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
Sanjay Tripathi
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
Sanjay Tripathi
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
Min Chen
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
Min Chen
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
Kishan Kavala
e427d0004c
CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume
2014-11-03 17:20:21 +05:30
Kishan Kavala
99010f463b
CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot
2014-11-03 17:20:00 +05:30
Kishan Kavala
d6fdb7c6bc
CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access
2014-11-03 17:19:15 +05:30
Santhosh Edukulla
1aef5cba66
Fixed Coverity Issues
2014-11-03 16:45:30 +05:30
Santhosh Edukulla
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
amoghvk
efc9632c1b
CLOUDSTACK:6915 search including removed
2014-10-31 15:47:18 -07:00
amoghvk
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
amoghvk
0c153966e6
CLOUDSTACK:6915 search including removed
2014-10-31 15:29:07 -07:00
Nitin Mehta
138366804d
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:25:06 -07:00
Nitin Mehta
2652195010
CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event.
2014-10-31 15:24:32 -07:00
Rohit Yadav
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
Rohit Yadav
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
Rohit Yadav
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
Anshul Gangwar
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
Anshul Gangwar
d8b46b81b9
CLOUDSTACK-7767: fixed events are not generated for snapshot creation
2014-10-30 13:25:06 +05:30
Anshul Gangwar
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
Anthony Xu
c78f14cbc2
fixed NPE
2014-10-29 17:05:42 -07:00
Edison Su
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
Min Chen
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
Sheng Yang
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
Sheng Yang
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
Min Chen
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
Sanjay Tripathi
db6a0d65aa
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:26:06 +05:30
Sanjay Tripathi
4f4595cef8
No need to log discrepancy resource count message for Primary and secondary storage.
2014-10-27 15:23:36 +05:30
Sanjay Tripathi
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
Sanjay Tripathi
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
Anthony Xu
32dc09f2c3
even xenserverinvestigator returns true, that means host is up, but XAPI may not work
2014-10-23 16:10:18 -07:00
Edison Su
10cc7f86af
CS-21296: hidden snapshot.backup.rightafter, as it's not needed
2014-10-22 15:36:35 -07:00
Anthony Xu
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
Anthony Xu
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
Nitin Mehta
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
Mike Tutkowski
97aa02ceb0
Commits related to taking snapshots that live on primary storage
2014-10-22 12:44:33 -06:00
Anthony Xu
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
Anthony Xu
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
Mike Tutkowski
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
Mike Tutkowski
06f6b00cd1
Snapshot support
2014-10-21 16:01:13 -06:00
Nitin Mehta
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
Nitin Mehta
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
Nitin Mehta
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
Daan Hoogland
1de0cb7094
restore barematel work after merge
2014-10-17 10:24:01 +02:00
Daan Hoogland
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
Sanjay Tripathi
1f8cf0bee4
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:38:33 +05:30
Sanjay Tripathi
ec6a666855
Config value having different category in SQL and Config.java.
2014-10-16 14:38:23 +05:30
Sanjay Tripathi
420d4e0da0
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.
2014-10-16 14:25:30 +05:30
Sanjay Tripathi
5025071954
Config value having different category in SQL and Config.java.
2014-10-16 14:01:23 +05:30
Sanjay Tripathi
80e0c99189
Removed duplicate code and unused imports which was causing build failure.
2014-10-16 13:53:32 +05:30
Santhosh Edukulla
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
Jayapal
53ee4cd794
CLOUDSTACK-7728: Removed duplicate import
2014-10-16 10:05:06 +05:30
Damodar
7fe3c45142
CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response
2014-10-16 09:43:04 +05:30
Jayapal
e257c13f16
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:38:21 +05:30
Jayapal
f488a8f72c
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:38:21 +05:30
Bharat Kumar
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
Jayapal
55e11cddca
CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot
2014-10-16 09:37:43 +05:30
Jayapal
7cd3438580
CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes
2014-10-16 09:37:42 +05:30
Bharat Kumar
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
Nitin Mehta
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
Nitin Mehta
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
Mike Tutkowski
e70dde09c9
Implementing snapshot-strategy support for reverting a volume to a snapshot
2014-10-14 22:04:18 -06:00
Mike Tutkowski
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
Daan Hoogland
771d052381
Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack
2014-10-14 20:14:50 +02:00
wilderrodrigues
1e87d7b266
Fixing checkstyle.
...
Making local variable compatible with our checkstyle settings.
2014-10-14 15:25:50 +02:00
wilderrodrigues
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
Wilder Rodrigues
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
Wilder Rodrigues
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
wrodrigues
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
wrodrigues
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
wrodrigues
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
Wilder Rodrigues
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
Wilder Rodrigues
60eea3bb1a
Adding fixes for the add user data and vpn rules
2014-10-14 15:08:11 +02:00
Wilder Rodrigues
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
Wilder Rodrigues
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
Antonio Fornie
64eed6c6ab
Fix: VpcRouter has always PublicIp setup as it did before refactoring
2014-10-14 15:08:10 +02:00
Wilder Rodrigues
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
wrodrigues
b7c193a88d
fixing nic plug unplug rule
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-14 15:08:10 +02:00
wrodrigues
5f51a06e3c
fix dhcp subnet rules. we can create VMs again.
2014-10-14 15:08:10 +02:00
Antonio Fornie
02c75251b3
Fixing NPE due to use of dependencies before Spring injection
2014-10-14 15:08:09 +02:00
Antonio Fornie
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
Wilder Rodrigues
65fb21647a
auto wire the network helper
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:08:09 +02:00
Wilder Rodrigues
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
Antonio Fornie
b5e96af4e2
Missing license headers
2014-10-14 15:02:14 +02:00
Antonio Fornie
2802d3b75b
Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers
2014-10-14 15:02:14 +02:00
Wilder Rodrigues
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
wrodrigues
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
Antonio Fornie
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
Antonio Fornie
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
wrodrigues
adebaf2bd0
adding applyStaticRoutes to the new visitor pattern.
2014-10-14 15:02:13 +02:00
Wilder Rodrigues
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
Antonio Fornie
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
Wilder Rodrigues
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
wrodrigues
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
Antonio Fornie
0d81cf09f6
Increasing test coverage for Vpc Deployment
2014-10-14 15:01:16 +02:00
Antonio Fornie
240a539d43
Factor out prepareDeployment and update tests
2014-10-14 15:01:16 +02:00
Antonio Fornie
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
Wilder Rodrigues
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
Antonio Fornie
a83f5790eb
License headers
2014-10-14 15:01:15 +02:00
Antonio Fornie
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
Antonio Fornie
f3c04172a4
RouterDeployment and VPC. Improving code and Unit Testing
2014-10-14 15:01:14 +02:00
Antonio Fornie
8852153d0c
Splitting Vpc and NonVpc deployment into phases & testing it
2014-10-14 15:01:14 +02:00
Wilder Rodrigues
325026de3f
fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology
2014-10-14 15:01:14 +02:00
Wilder Rodrigues
b97f2b05c7
apply network acls; acls items to pvt gw; vpc ip association
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:01:14 +02:00
Antonio Fornie
f23ba91ed1
Fixing null pointers during vpc router deployment
2014-10-14 15:01:13 +02:00
Wilder Rodrigues
bfd4316b58
adding new bean to spring context file; renaming package from "com" to "org"
2014-10-14 15:01:13 +02:00
Wilder Rodrigues
0b78731bc7
fixing import in virtual router element and checkstyle in dhcp entry related changes
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/rules/DhcpEntryRules.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
2014-10-14 15:01:12 +02:00
Antonio Fornie
95395f9574
Deployment more OO - Objects with data and behavior
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:01:12 +02:00
wrodrigues
e99b5b0760
fixing the injection of the networkDao
...
Conflicts:
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
2014-10-14 15:00:33 +02:00
Daan Hoogland
c76952b5ff
whitespace
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
2014-10-14 15:00:33 +02:00
wrodrigues
d15329679b
fixing injection of beans with a relationship
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:00:33 +02:00
Wilder Rodrigues
8f313ca5d3
adding user data pwd rules
...
Conflicts:
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
2014-10-14 15:00:32 +02:00
Wilder Rodrigues
b9ffe2329e
making instance variables compliant with ACS convention
...
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 15:00:32 +02:00
Wilder Rodrigues
f0189ac3c3
adding userdata to router and ssh pub key to router rules.
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
2014-10-14 15:00:32 +02:00
Antonio Fornie
631b561d9c
Unify and encapsulate deployment flow methods and params
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:00:31 +02:00
Wilder Rodrigues
299c42c336
adding password to router rules; moving the advance code to the advance net topology.
...
Conflicts:
server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
2014-10-14 14:55:26 +02:00
Wilder Rodrigues
87f0e68983
fixing the classes relationship; adding beans properly in the spring context; using the right basic/advance stuff; testing ip and port forwarding rules
...
Conflicts:
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
2014-10-14 14:55:25 +02:00
Antonio Fornie
a98253296a
Temporary put state info in a state object
2014-10-14 14:55:25 +02:00
Daan Hoogland
e1866bf90d
package rename
...
Conflicts:
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/DhcpSubNetRules.java
2014-10-14 14:55:25 +02:00
Antonio Fornie
563f853d59
Fix offering setup
2014-10-14 14:55:24 +02:00
Wilder Rodrigues
6b2d35c8c2
adding Ip Association and VPN Rules
...
Conflicts:
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
2014-10-14 14:55:24 +02:00
Wilder Rodrigues
f965fb9672
adding apache license headers
2014-10-14 14:55:24 +02:00
Wilder Rodrigues
7e98e3e132
we have to check if VPC is null bfore calling it. VPC is not used in gest networks, so deploying a new VM was broken.
2014-10-14 14:55:23 +02:00
Wilder Rodrigues
fb8973f1e2
adding static nat rules. Deploying new VMs is not working due to the appliance refactory, will check the changes with Antonio tomorrow.
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
2014-10-14 14:55:23 +02:00
Daan Hoogland
f17a0b835c
TODO
2014-10-14 14:55:23 +02:00
Wilder Rodrigues
4b1112af28
finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected.
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
2014-10-14 14:55:23 +02:00
Wilder Rodrigues
bbce7d944b
fixing checkstyles
...
Conflicts:
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
2014-10-14 14:55:22 +02:00
Wilder Rodrigues
3457d0fbaf
changing accessor modifier in instance variables
2014-10-14 14:55:22 +02:00
Wilder Rodrigues
65d7e0756d
Adding Firewall Rules to comply with the Visitor pattern implementation; refactoring the applyRules so we can reuse it.
...
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
server/src/com/cloud/network/topology/BasicNetworkTopology.java
server/src/com/cloud/network/topology/NetworkTopology.java
2014-10-14 14:55:22 +02:00
Antonio Fornie
24b230d11b
Fix dependency problem. Extract and unify router deployment stuff
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 14:55:22 +02:00
Antonio Fornie
f28426e1a2
Extract general behavior to Router and Vpc delegates
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 14:51:02 +02:00
Antonio Fornie
1a85213bbf
Rules and visitors for Load Balance Rules
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
2014-10-14 14:46:38 +02:00
Sanjay Tripathi
176e0d47bb
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
2014-10-14 17:55:37 +05:30
Sanjay Tripathi
e4a8bbcdf4
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
2014-10-14 17:53:50 +05:30
Santhosh Edukulla
0a9742f914
Fixed few coverity issues
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-14 17:16:50 +05:30
Nitin Mehta
a6d575b127
CLOUDSTACK-7699: Disable ROOT volume attach/detach ability.
2014-10-13 13:57:45 -07:00
Santhosh Edukulla
350ac4c4b0
Fixed Resource Leaks
...
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-13 17:51:02 +05:30
Rajesh Battala
0f528df228
CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS
2014-10-13 15:57:13 +05:30
Damodar
50185b7c3a
CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events
2014-10-13 14:42:00 +05:30
Kishan Kavala
b6cacb3d67
change dos line ending to unix format
2014-10-13 12:34:32 +05:30
Edison Su
c10189f79a
if vpc public network with snat enabled, then will triger this issue;
...
(cherry picked from commit 6b8e0baa21 )
2014-10-13 00:39:10 -04:00
amoghvk
da73d735b2
Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
...
This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds
(cherry picked from commit fbcab01ff0 )
2014-10-13 00:37:34 -04:00
Kishan Kavala
db79dd1ef5
CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead
...
(cherry picked from commit 63109a97b1 )
2014-10-13 00:36:30 -04:00
Sanjay Tripathi
eb447f14e2
CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is failing.
...
VM snapshot with memory is not supported for VGPU VMs, so putting checks
for same.
(cherry picked from commit 123ec8b3d3 )
2014-10-13 00:35:13 -04:00
Sanjay Tripathi
d058fa6880
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
(cherry picked from commit d910b4ff14 )
2014-10-13 00:32:03 -04:00
Santhosh Edukulla
0df43197d9
Fixed few coverity issues
...
(cherry picked from commit 45597766a5 )
2014-10-13 00:30:01 -04:00
Anthony Xu
ba1862836e
ccp should not check public ip resource when deploy a vm on shared network
...
(cherry picked from commit 3201251256 )
2014-10-13 00:27:01 -04:00
Sanjay Tripathi
47d2a578ee
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
(cherry picked from commit 39fe766c2b )
2014-10-13 00:15:03 -04:00
Likitha Shetty
54110edda1
CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception".
...
(cherry picked from commit bca71ec169 )
2014-10-13 00:14:09 -04:00
Kishan Kavala
759b5fa048
For network stats aggregation job, get the most recent mgmt server id to do the aggregation. Set dao filter to descending.
...
(cherry picked from commit ce5c35b193 )
2014-10-13 00:13:45 -04:00
Anthony Xu
ee23be1942
when system VM ping times out, stop system VM
...
(cherry picked from commit 847e1e47ae )
2014-10-13 00:11:21 -04:00
Jayapal
26ac4dd395
CLOUDSTACK-7615: Update log msg to print error msg rather than exception
...
(cherry picked from commit 1d01ee3a60 )
2014-10-13 00:06:40 -04:00
Devdeep Singh
549840dd0d
CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware and xenserver. If
...
the operation is tried on other hypervisors it fails but logs a stack trace. We
should just log a message that the operation isn't supported.
(cherry picked from commit ec1123aca1 )
2014-10-13 00:01:55 -04:00
Rohit Yadav
6e04f93785
CID-1192822: ids is a List<Long>, the cast to List<?> is removed
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 92858afd55 )
2014-10-12 23:58:17 -04:00
Rohit Yadav
4d8dfc9b7c
CID-1192810: Remove useless control flow
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f74446a195 )
2014-10-12 23:58:06 -04:00
Rohit Yadav
ff42d5ad54
CID-1211005: Fix comparison, Class<?> is always instance of Class
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 59482b3eba )
2014-10-12 23:57:53 -04:00
Rohit Yadav
a35521315e
CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 60e492aeb9 )
2014-10-12 23:57:13 -04:00
Koushik Das
1b0618d39c
CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
...
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required
(cherry picked from commit a6ee4112a5 )
2014-10-12 23:43:01 -04:00
Nitin Mehta
988b9efc97
CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors.
...
(cherry picked from commit 082aed3d33 )
2014-10-12 23:39:21 -04:00
David Nalley
ffe846673c
more revert cleanup
2014-10-12 23:31:17 -04:00
David Nalley
3cac7f01bb
Revert "CLOUDSTACK-6278"
...
This reverts commit bc2ec23d09 .
2014-10-12 23:19:30 -04:00
Edison Su
6b8e0baa21
if vpc public network with snat enabled, then will triger this issue;
2014-10-09 16:48:09 -07:00
amoghvk
fbcab01ff0
Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
...
This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds
2014-10-09 15:39:19 -07:00
Kishan Kavala
63109a97b1
CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead
2014-10-09 10:27:49 +05:30
Sanjay Tripathi
123ec8b3d3
CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is failing.
...
VM snapshot with memory is not supported for VGPU VMs, so putting checks
for same.
2014-10-08 19:21:12 +05:30
Sanjay Tripathi
d910b4ff14
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
2014-10-07 16:49:38 +05:30
Santhosh Edukulla
45597766a5
Fixed few coverity issues
2014-10-07 12:19:39 +05:30
Anthony Xu
3201251256
ccp should not check public ip resource when deploy a vm on shared network
2014-10-02 16:03:34 -07:00
amoghvk
0ef6cd36c4
Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect"
...
This reverts commit 39fe766c2b .
2014-10-02 13:28:52 -07:00
Sanjay Tripathi
39fe766c2b
CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
...
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.
Also added FirstFitPlannerTest unit test file.
2014-10-01 17:25:41 +05:30
Likitha Shetty
bca71ec169
CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception".
2014-10-01 15:41:50 +05:30
Kishan Kavala
ce5c35b193
For network stats aggregation job, get the most recent mgmt server id to do the aggregation. Set dao filter to descending.
2014-10-01 14:24:50 +05:30
Anthony Xu
847e1e47ae
when system VM ping times out, stop system VM
2014-09-30 12:35:44 -07:00
Jayapal
1d01ee3a60
CLOUDSTACK-7615: Update log msg to print error msg rather than exception
2014-09-29 17:15:42 +05:30
Devdeep Singh
ec1123aca1
CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware and xenserver. If
...
the operation is tried on other hypervisors it fails but logs a stack trace. We
should just log a message that the operation isn't supported.
2014-09-26 13:15:31 +05:30
Rohit Yadav
f74446a195
CID-1192810: Remove useless control flow
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-25 17:02:13 +02:00
Rohit Yadav
92858afd55
CID-1192822: ids is a List<Long>, the cast to List<?> is removed
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-25 16:59:47 +02:00
Rohit Yadav
59482b3eba
CID-1211005: Fix comparison, Class<?> is always instance of Class
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-25 16:52:09 +02:00
Rohit Yadav
60e492aeb9
CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-25 16:43:48 +02:00
Harikrishna Patnala
c55bc0b2d1
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
2014-09-24 16:35:23 +05:30
Hugo Trippaers
3a5401f8f9
Merge branch 'bugfix/CID-1240106'
2014-09-24 09:07:20 +02:00
Sheng Yang
aaeadc5c44
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 6dd5c3fd42
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Thu Oct 11 18:30:00 2012 +0530
CLOUDSTACK-70: Improve restart network behaviour for basic network
2014-09-23 14:17:42 -07:00
Hugo Trippaers
9ead2046d4
CID-1240106 Remove unused variable
2014-09-23 11:02:40 +02:00
Koushik Das
a6ee4112a5
CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
...
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required
2014-09-22 16:45:37 +05:30
Nitin Mehta
082aed3d33
CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors.
2014-09-19 13:40:17 -07:00
Hugo Trippaers
2df41e857e
CID-1114592 Replaced duplicate code with a call to super
2014-09-19 14:47:13 +02:00
Hugo Trippaers
9cfab9b815
CID-1114591 Replace duplicated functionality with a call to super like the other state classes
2014-09-19 14:42:20 +02:00
Hugo Trippaers
cf4ff03c90
CID-1191682 Fix missing break statement
2014-09-19 08:28:42 +02:00
Frank Zhang
b11e3bc60a
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Frank Zhang
bc2ec23d09
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-18 16:54:37 -07:00
Koushik Das
4e07dd1dc4
CLOUDSTACK-7581: Empty 'ID' parameters allowed in API calls
...
Fix is to fail API calls with empty 'id' parameter value upfront rather than going ahead and failing with NPE later on
2014-09-18 17:10:25 +05:30
Daan Hoogland
dec9133dcd
CLOUDSTACK-7184: xenheartbeat gets passed timeout and interval
...
(cherry picked from commit 4d065b9a3a )
Conflicts:
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/resource/DiscovererBase.java
2014-09-18 12:51:10 +02:00
Rohit Yadav
bfa36c0280
CID-1233090, CID-1233089: Synchronize on session object in ApiServer
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-18 11:26:20 +02:00
Rohit Yadav
190bd38026
server: remove unused imports that failed build in last run
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:53:32 +02:00
Rohit Yadav
369b5b439b
CID-1192812: Remove dead code from DataCenterJoinDaoImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:29:03 +02:00
Rohit Yadav
bfd8af0751
CID-1192811: Remove dead local store from VolumeJoinDaoImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 16:27:41 +02:00
Rohit Yadav
c27dd6293e
CID-1233085: Fix potential NPE in AccountManagerImpl from VpcManagerImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 15:56:03 +02:00
Rohit Yadav
a5004e37ad
CID-1233084: Fix NPE in persisting volume in VolumeApiServiceImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 10:39:53 +02:00
Rohit Yadav
bdee5e3734
CID-1233086: Fix potential NPE blowup in UserVmManagerImpl
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-17 10:32:23 +02:00
Anthony Xu
cb45133799
for windows guest OS, configure gateway for each nic
2014-09-16 14:33:22 -07:00
Rohit Yadav
a1e8d5eefb
CID-1233087: In case of no virtual routers, fail early
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-16 17:27:32 +02:00
Rohit Yadav
fbbd2f8932
CID-1233088: In case there is no GSLB SP, throw cloud exception
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-16 17:17:11 +02:00
Anthony Xu
15a3bb318f
When deploying a VM with startvm=false, the root volume is in Allocated state, the root volume is not created in primary storage yet.
...
need to handle restoreVM for VM which is above status.
2014-09-15 18:49:15 -07:00
Nitin Mehta
0a4ab3251a
CLOUDSTACK-7513: listServiceOfferings API when called with VM's id also returns offerings to which it cant be upgraded. Adding the logic that when vmid is passed it looks for compatible offerngs using the storage type (local/shares), storage tags and also compute (cpu,speed, memory) in case the vm is running.
...
Also changed the scaleVm API to upgrade only when the destination offering has storage tags as a subset of current offering tags.
2014-09-15 11:02:34 -07:00
Saksham Srivastava
8c671c49b3
CLOUDSTACK-7548:removeNICFromVM should check for networkId while checking for PF rules on the nic
2014-09-15 19:15:09 +05:30
Devdeep Singh
283666b038
Password is logged in api server logs while creating a storage pool and while
...
adding an image store of type SMB. Cleaning the message before logging.
2014-09-12 14:31:17 +05:30
Frank Zhang
7a555b398f
CLOUDSTACK-7523
...
java.lang.NullPointerException when listing accounts
2014-09-10 14:43:41 -07:00
Frank Zhang
e06fa18ed2
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-10 14:43:41 -07:00
Ilia Shakitko
70142c4acb
Added "usageid" parameter to the "listUsageRecords" API call. Can be used only together with "type" parameter specified
...
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-10 12:19:34 +02:00
Rohit Yadav
91fd8d7cd5
CLOUDSTACK-7528: More verbose logging when sending alert fails
...
When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 885c02dbd8 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
2014-09-10 11:38:47 +02:00
Kishan Kavala
c773754fda
CLOUDSTACK-7504,CLOUDSTACK-7507: For LXC host maintenance, migrate system Vms and schedule restart of users Vms
2014-09-08 18:13:11 +05:30
Frank.Zhang
10544e287b
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-05 16:28:34 -07:00
Frank Zhang
197332464f
CLOUDSTACK-6278
...
Baremetal Advanced Networking support
2014-09-05 16:28:33 -07:00
Nitin Mehta
f9d7a12a57
CLOUDSTACK-7481: Assertion/exception in listVolumes call from UI with assert enabled
...
searchForVolumesInternal() indicated some inconsistency in the use of entity().isDisplayVolume() property – used twice as “display” and “displayVolume” in search criteria. And then exception/assert happens while setting the property.
Correcting the issue.
2014-09-05 11:35:11 -07:00
Will Stevens
b145a7d140
null deref when no project found
2014-09-05 10:06:25 -04:00
Harikrishna Patnala
5d389b1a71
CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-09-05 14:59:33 +05:30
Edison Su
ce82ab605d
listhost api needs to return host_details table
2014-09-04 17:57:24 -07:00
Will Stevens
0fa0320860
CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is associated
2014-09-04 14:11:21 -04:00
Will Stevens
cacbc80ab1
Merge branch 'origin/CLOUDSTACK-7468'
2014-09-04 14:08:07 -04:00
Will Stevens
18653f6cd6
CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is applied
2014-09-04 13:02:12 -04:00
Kishan Kavala
6f7c4863a2
CLOUDSTACK-7473: Vm migration is not supported for LXC. When host is put in maintenance mode, stop the Vms instead of migrating
2014-09-04 20:59:19 +05:30
Fred Clift
355eb72c7d
make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously
...
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-04 04:22:27 -04:00
Mike Tutkowski
1d2f3300ad
Adding support for SolidFire snapshots
2014-09-03 20:09:00 -06:00
Will Stevens
5d11385c31
CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects
...
Signed-off-by: Will Stevens <wstevens@cloudops.com>
2014-09-03 10:07:19 -04:00
Min Chen
5f7b4dbbb2
CLOUDSTACK-7471:Regular user is allowed to deleteNetwork/RestartNetwork
...
that does not belong to him.He is also able to deploy Vm for other
users.
2014-09-02 17:24:08 -07:00
Mike Tutkowski
ba41f230e1
CLOUDSTACK-7467 (this part of the ticket is related to augmenting an error message)
2014-09-02 12:51:01 -06:00
Kishan Kavala
f44be742f8
CLOUDSTACK-7447: Send modify storage pool command on host connect to LXC hosts
2014-09-01 12:39:05 +05:30
Rohit Yadav
33a249e77a
CLOUDSTACK-7455: Fix possible case for NPE
...
NPE can happen if Spring fails to inject api authenticator, so better check
and set list of commands if the authenticator is not null or returning null cmds
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-31 14:42:18 +02:00
Mike Tutkowski
de6a3112b6
Update to volume-resize logic
2014-08-28 23:19:04 -06:00
Rohit Yadav
6eae9b8596
saml: disable plugin by default and don't initiate if not enabled
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:49:48 +02:00
Rohit Yadav
249446dc52
server: add config to enable/disable SAML SSO/SLO plugin
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:27 +02:00
Rohit Yadav
b0f3d66f9d
Config: add config for saml user account, domain and redirected URL to ACS UI
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:25 +02:00
Rohit Yadav
47ccce85a1
api: add method to pass on api authenticators to cmd classes
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:24 +02:00
Rohit Yadav
0444bfb653
server: Add IDP entity ID config param
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:24 +02:00
Rohit Yadav
5d94fd5be5
server: Add SAML related config params in Config
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:23 +02:00
Rohit Yadav
37d696db80
ApiServer: Fix imports order, use org.apache.cloudstack.api.ApiServerService
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:23 +02:00
Rohit Yadav
591a686d77
server: fix server package after auth plugin refactor
...
- Have opensaml dependency to get version from root pom
- add com.cloud.api.auth.APIAuthenticationManagerImpl to spring ctx manager
- Fix getCommands() in APIAuthenticationManagerImpl
- Fix imports in resources, test and src classes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:23 +02:00
Rohit Yadav
68e094ebaf
saml: move refactor files from server to api module
...
- Move interfaces and classes from server to api module
- This can be then used for pluggable api authenticators
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:22 +02:00
Rohit Yadav
a364054db6
Minor fixes
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:21 +02:00
Rohit Yadav
2464e02bf4
SAML2LoginAPIAuthenticatorCmd: Set all necessary cookies and redirect to UI
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:21 +02:00
Rohit Yadav
2694ad7bd9
ApiServlet: Fix NPE while inserting to auditTrail
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:21 +02:00
Rohit Yadav
a1dc9e8189
SAML2LoginAPIAuthenticatorCmd: Implement SAML SSO using HTTP Redirect binding
...
- Creates SAMLRequest and uses HTTP redirect binding (uses GET/302)
- Redirects to IdP for auth
- On successful auth, check for assertion
- Tries to get attributes based on standard LDAP attribute names
- Next, gets user using EntityManager, if not found creates one with NameID as UUID
- Finally tries to log in and redirect
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:21 +02:00
Rohit Yadav
9c7204d386
DefaultLoginAPIAuthenticatorCmd: move createLoginResponse to ApiServer
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:21 +02:00
Rohit Yadav
1a3813a342
ApiServer: change loginUser method signature to return ResponseObject
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:20 +02:00
Rohit Yadav
b82207e081
SAML: WIP redirections work now
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:20 +02:00
Rohit Yadav
df95a762f4
SAML2: add saml sso and slo apicmds skeleton, add classes to AuthManager
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-28 19:45:20 +02:00
Saksham Srivastava
d9531fb0de
CLOUDSTACK-7453: Network rate field specified with negative value in service offering results in db Exception
2014-08-28 16:01:11 +05:30
Saksham Srivastava
490d499b7f
CLOUDSTACK-7453: Network rate field specified with negative value in service offering results in db Exception
2014-08-28 15:28:00 +05:30
Kishan Kavala
55983d47c0
CLOUDSTACK-7400: Allow migration of systemVms in LXC. USer Vms cannot be migrated
2014-08-27 13:05:04 +05:30