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
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
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
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