f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
657d9e4789
Allow different VLANs have ovveride subnet for shared network
2014-02-03 15:03:31 -08:00
ed3e1b95b0
VPC Support for contrail networking
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-30 18:13:48 -08:00
53feecaa76
findbugs: null check for gateway and netmask instead of gateway
...
twice(cherry picked from commit
d30ddf6d59
2014-01-28 14:53:11 +01:00
0502d2f375
CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
...
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
8ee61f3a57
CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
...
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
cb0c14671a
CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr
2014-01-07 10:20:30 -08:00
2cf356e047
isSameIsolationId
2013-12-31 12:25:17 +01:00
7b0c85da3c
CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null
2013-12-20 13:46:58 +01:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
c60a256ebd
fixed egress rules for palo alto plugin and cleaned up extra api calls on master
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-12-09 18:26:57 -08:00
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
68406ba29d
CLOUDSTACK-5161 enable scaling of a vm using custom offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
c29cd9d3c7
CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
...
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot
CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 12:19:31 +05:30
19e9849d86
Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
...
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
85f38b3e07
Fix CID 1127051 DLS: Dead local store
...
Fix CID 1127050 WMI: Inefficient Map iterator
2013-11-07 15:01:21 +01:00
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
8f8ad3f38e
Squashed commit of the Palo Alto Networks firewall integration plugin.
...
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).
More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration
Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)
Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-11-06 10:08:22 -08:00
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -07:00
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
0fb4d9d5a2
Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors.
2013-10-25 10:56:19 -07:00
24725f8e21
ResourceDetails:
...
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
a3b1a49c30
CLOUDSTACK-3911: [PortableIP] there is no check while adding a zone
...
public range to see whether the same VLAN exists in portable IP range.
added check to enusre a VLAN id used for a public IP range is not used
for portable ip range
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-10-18 17:34:03 +05:30
a92095a4a6
CLOUDSTACK-4811:Fixed zone creation wizard is allowing to accept wrong sub net mask which is cauing wrong cidr value for a given ip range
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-10-18 15:51:51 +05:30
aaa99cd9de
CLOUDSTACK-4596: CloudStack is currently allowing same ip range to be
...
defined in different VLANs across public and portable ranges
added checks to restric same ip range to be configure as both public ip
range and portable ip range
2013-10-18 15:38:41 +05:30
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
a6852a340d
CLOUDSTACK-3101:
...
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 18:19:07 -07:00
efbfae723e
Switch to setter injection for extensibility
...
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00
6f970c6ff9
static nat capabilities parsing cleanup and testing
2013-09-26 15:18:52 +02:00
77bec4f2ad
Cloudstack-2997: the maxconn setting is masked by wrong conditions
2013-09-25 21:09:24 +05:30
aba54356d5
Account_Type Refactoring for Root Admin Role
...
- change the AccountService::isRootAdmin(short) to isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
2013-09-24 15:31:09 -07:00
2614b00c51
sdn hosted vpc gateways (using lswitch)
2013-09-18 16:56:56 +02:00
832db1b398
Apply https://reviews.apache.org/r/14084/
2013-09-17 16:29:48 -07:00
1f5699b29f
Fixed unit tests
2013-09-06 15:40:39 -07:00
8f556e6d88
Made changes to configuration. Eliminated ConfigValue and only use ConfigKey
2013-09-06 15:40:38 -07:00
b8e79c30a8
Compile complete
2013-09-06 15:40:37 -07:00
6e8ca99466
Got all of the config stuff out of the way
2013-09-06 15:40:36 -07:00
47afae8112
Merged conflicts resolved
2013-09-06 15:40:36 -07:00
435e74e914
Commit to try something on removing getZone
2013-09-06 15:40:33 -07:00
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
f31c318158
Changes required to merge to master:
...
- Replace UserContext by CallContext
2013-09-03 20:03:11 -07:00
012afceed2
CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues
...
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table
updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table
listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.
DedicateZone API:
- set domainid in the data_center table
ReleaseDedicatedZone API:
- remove zoneid from the data_center table
2013-09-03 20:02:56 -07:00
96ca70e2da
CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API
...
Changes:
- Block API from creating this type of group
2013-09-03 20:02:53 -07:00
ef22b42b38
CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
...
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.
Conflicts:
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
bdba0ddeed
Bring up to date with master
2013-08-31 00:25:48 +01:00
4a9b2fb584
Since some config values moved to individual ConfigKey<T> from Config.java, validation is broken for those keys. Workaround the issue so that updateConfiguration API still works
2013-08-27 18:04:30 -07:00
8113ebb08f
Moved the csvtotags into StringUtils. It was there to begin with. No idea who copied it to ConfigurationManager
2013-08-26 20:27:27 -07:00
abbae2aa87
Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.
2013-08-26 17:31:10 -07:00
2d05fe40c0
Removed getPod, getCluster from ConfigurationManager
2013-08-26 17:31:09 -07:00
ff6b3fd11a
Removed getzone
2013-08-26 17:31:08 -07:00
092e20204a
Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl
2013-08-19 14:13:29 -07:00
ae617b6a35
Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user"
...
This reverts commit 94254e3c2b
2013-08-14 15:22:36 -07:00
5cff9bd2e6
CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
...
only when there is portable IP range added at region level.
region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc
2013-08-08 15:02:40 -07:00
b59e3aaefc
Reverting the range of commits that broke the build
...
This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
5287f4c9ec
Got everything running through testing
2013-08-07 16:41:06 -07:00
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
151a7ee497
CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.
2013-08-02 18:16:46 -07:00
c7a1dbb176
Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
5552d26872
Fix a few typos in ConfigurationManager.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c78ed39b2f
2013-07-30 11:25:15 +05:30
eaa4143371
Merge LDAPPlugin
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
555211a080
Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine
2013-07-25 03:57:12 -07:00
0010faee4b
Fix for CLOUDSTACK-2536
...
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
2013-07-25 13:42:08 +05:30
04cdd90a84
in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan.
2013-07-22 14:29:38 -07:00
d73bb22802
Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
954e197813
Cloudstack-2997: maxconn missing param
2013-07-17 10:06:11 +05:30
dd33abffbe
Cloudstack-2997 Make haproxy maxconn configurable
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
6b549074fa
Cloudstack-3313 Cannot deploy vm in ipv6 network
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
11e1e585b1
UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch
2013-07-16 11:24:21 -07:00
f53db88bae
CLOUDSTACK-2960: [portableIPrange] CS should check the portable ip range, vlan with
...
existing public ip ranges and vlans
adds a validation check to ensure there is no VLAN in the zones with
same id
2013-07-15 16:16:47 +05:30
0c1ae20e77
add inital swift support
...
Conflicts:
server/src/com/cloud/resource/ResourceManagerImpl.java
server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
54c2133590
CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage
2013-07-01 16:17:43 -07:00
99227f7b3e
SolidFire plug-in and related changes
...
SolidFire plug-in
SolidFire plug-in related
2013-06-28 16:59:21 -06:00
974245991c
Cloudstack-2732 [Multiple_IP_Ranges] Deleting guest IP range is not throwing any error message to user while the ip addresses are being used
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
6b0df2566d
Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
55f0e167ec
CLOUDSTACK-3206. CreateVlanIpRange fails with IndexOutOfBoundsException.
2013-06-26 14:59:36 +05:30
94254e3c2b
fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user
2013-06-26 15:55:32 +08:00
8a1fefc7aa
CLOUDSTACK-3192. When a dedicated public ip range is released, don't generate usage event EVENT_NET_IP_RELEASE
...
for ips in the range that are in use becauase these ips are not disassociated from the account.
2013-06-26 10:51:39 +05:30
f7b1d3d8d5
CLOUDSTACK-2916: admin is not able to login through UI after setting GP "cluster.cpu.allocated.capacity.notificationthreshold" to some string
...
CLOUDSTACK-2457: No check for input values,special character,-ive values can be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"
Added validation for float values and checking limit for weight based parameters by creating a set of parameters.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-24 20:00:09 +05:30
e9df9c29bd
CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is still associated with that zone.
...
Check if there exists any VMware DC already associated with this zone. Deny zone deletion if true.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-24 12:11:31 +05:30
6a7ae637dd
CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider
2013-06-24 13:37:00 +05:30
5f28dcc6bb
merge to master
2013-06-19 22:41:13 -07:00
febe7d9cff
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a subnet
2013-06-20 10:44:48 +05:30
4d5c6c8381
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new subnet
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 10:40:23 +05:30
9aec9c605c
merge to master
2013-06-19 18:16:47 -07:00
882220e802
CLOUDSTACK-1301: VM Disk I/O Throttling
2013-06-18 10:02:55 +02:00
5d0a1cee13
CLOUDSTACK-2883: create default network offering with internal lb support (if doesn't exist already)
2013-06-17 16:13:19 -07:00
952fa2464d
LOUDSTACK-2914: handle situation when serviceProvider map is empty
2013-06-17 10:55:33 -07:00
fc16e29f99
CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is not specified explicitly
2013-06-17 10:10:43 -07:00
f41c800d88
merge to master
2013-06-14 19:06:33 -07:00
7663684981
fix CLOUDSTACK-2989 normal user are allowed to create isolated network offerings with vlan assignments
...
1) only root admin can list network offering with specifyVlan=true
2) only root admin can create network with specifyVlan=true
2013-06-14 14:58:24 +08:00
ff0a524bd6
CLOUDSTACK-2969: Exception when creating vlan ip range
...
Description:
Putting in null pointer check when creating ip range.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-13 11:07:12 +05:30
Prachi Damle
Anthony Xu
sbalineni
Daan Hoogland
Marcus Sorensen
Min Chen
Alena Prokharchyk
Daan Hoogland
Alex Huang
Will Stevens
Bharat Kumar
Harikrishna Patnala
Rajesh Battala
Hugo Trippaers
Mike Tutkowski
Darren Shepherd
dhoogland
Murali Reddy
Damodar Reddy
Nitin Mehta
Abhinandan Prateek
Kelven Yang
Ian Duffy
Chiradeep Vittal
Prasanna Santhanam
Thomas O'Dowd
Edison Su
Likitha Shetty
Mice Xia
Sateesh Chodapuneedi
Jayapal
Edison Su
Wei Zhou
Vijayendra Bhamidipati