929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
7c8facf3c9
Change checkstyle to run on every sub project, so it will also run when you build an individual module
2014-01-09 17:00:11 +01:00
b15431e574
CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller
2014-01-06 17:09:14 -08:00
647ea6e2d0
listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm
2014-01-06 17:09:14 -08:00
8b151c98c2
CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
...
restart, firewall rules dropped from iptables post restart
on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-27 14:27:57 +05:30
c75f8bcc06
CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
...
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
914bc46484
CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation
2013-12-23 16:28:06 -08:00
cca60cd86d
fix network ACL unit test
2013-12-23 17:27:16 +05:30
83bbe682d9
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2
2013-12-18 16:01:37 -08:00
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
cc27a740dc
CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
...
Conflicts:
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30
729a79e85c
Refactor db view based list apis to use new IAM acl search criteria.
2013-12-16 14:31:32 -08:00
cf0a11e45a
pull merges
2013-12-12 13:00:26 -08:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
7833dd592c
JUnit test for NetworkACLManagerImpl#applyNetworkACL
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 15:01:51 +01:00
b385cb4f7a
Fixed test case failures in network acl
2013-12-11 14:20:11 +05:30
5c12250dea
CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
...
1. Egress default policy rules is send to the firewall provider. It is up to the
provider to configure the rules.
2. The default policy rules are send for both allow and deny default policy.
3. On network shutdown rules for delete are send.
4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:19:03 +05:30
587f587621
CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to.
...
Conflicts:
api/src/com/cloud/network/vpc/NetworkACLService.java
api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-09 21:57:47 +05:30
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
414d415dba
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
11c0c263f2
QueryChecker interface and ACL search criteria to be used for query api
...
for entities with db views created.
2013-11-22 16:36:38 -08:00
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
62e9273581
Removed trailing spaces
2013-11-21 03:12:05 -08:00
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
91e176cb0d
Fix a bug in listVm logic to use revokedIds and grantedIds.
2013-11-19 16:41:40 -08:00
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
3f5b8f7063
CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router
2013-11-07 19:49:05 +05:30
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
9300d4a3ba
Added an api call to import all the ldap users to the same domains(ou's) in cloudstack
...
TODO:
1. error handling of no domains present, nested hierarchy
2. handling the case when the api call fails for a specific user/users
3. test cases for LdapUserManager
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2013-10-29 09:04:33 +00:00
5caeab782d
ResourceDetails -
...
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
51a8086cf6
Merge branch 'pluggable_vm_snapshot'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/resources/storageContext.xml
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
a6ce66e55a
move a lot of code into vmsnapshot strategy
...
fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases
2013-10-25 15:09:04 -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
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -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
2bb716efd8
ResourceMetaData (Resource details) fixes:
...
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -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
e33ae74067
CLOUDSTACK-4649:
...
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.
Anthony
2013-10-22 17:54:51 -07:00
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
ab124a17fa
Remove Network Parameter for VPN service provider
...
It's unnecessary since RemoteAccessVpnVO already have network ID binding with it.
2013-10-17 17:55:47 -07:00
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
2b4703b6e6
Change ListVMsCmd to use new role and entity permission information.
2013-10-09 21:56:52 -07:00
cf4a612cdb
Add license header
2013-10-05 12:18:34 -07:00
c9f41d4046
unit test for KVMFencer
...
A few cases covered with unit tests.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:38:33 -07:00
bd8536739c
remove txn attribute from DB
...
txn attribute was never actually used
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
765f56a02c
=Comment the test for now to unblock everyone. Will file a bug and fix it
2013-10-02 15:48:36 -07:00
cba8e40e4b
Add license headers to fix build
2013-09-30 09:51:45 -07:00
c61997f022
basic test for ApiDispatcher
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-30 13:08:15 +02:00
fce2aad23d
WIP For APIs related to ACL Roles.
2013-09-26 11:22:43 -07:00
6f970c6ff9
static nat capabilities parsing cleanup and testing
2013-09-26 15:18:52 +02:00
4294005142
Check if an Account belongs to RootAdmin group
2013-09-24 17:01:43 -07:00
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
2fa5a5ae97
CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC
...
(cherry picked from commit 798f34a49c
2013-09-23 14:18:41 +02: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
a05ec6df33
Fixed up the agent separation. Added comments for config packaging.
2013-09-06 15:40:39 -07:00
1f5699b29f
Fixed unit tests
2013-09-06 15:40:39 -07:00
b8e79c30a8
Compile complete
2013-09-06 15:40:37 -07:00
435e74e914
Commit to try something on removing getZone
2013-09-06 15:40:33 -07:00
2e5bb63f77
Moved NetworkManagerImpl to NetworkOrchestrator
2013-09-06 15:40:32 -07:00
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
5628153c59
CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
...
Changes:
- Adding mocks in unit tests for new injected components
Conflicts:
server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
2013-09-03 20:02:44 -07:00
a16fd4781c
CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation
...
There are three issues in resource_count table
(1) expunge a vm, the public_ip decreases and becomes -1 in basic zone.
(2) recover a vm, the volume increase.
(3) restore a vm, the volume decrease.
2013-09-02 16:56:34 +02:00
bdba0ddeed
Bring up to date with master
2013-08-31 00:25:48 +01: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
494ea5052f
Made IpAddressManager a manager
2013-08-19 14:13:31 -07:00
9f62df580e
Fixed up the unit tests
2013-08-19 14:13:30 -07:00
092e20204a
Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl
2013-08-19 14:13:29 -07:00
564502abd7
Moved the virtualmachine implementation into engine/orchestration
2013-08-19 14:13:28 -07:00
4ba359c3fe
Moved VirtualMachineManager into engine
2013-08-19 14:13:28 -07:00
15c93ba9b7
=CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted
...
Nitin Mehta <nitin.mehta@citrix.com>
2013-08-16 17:27:00 +05:30
3df5571d2e
Resolved merge conflicts
2013-08-12 20:15:24 -07:00
de2bd96d98
Moved volume related code into cloud-engine-orchestration
2013-08-12 19:06:51 -07:00
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc
2013-08-08 15:02:40 -07:00
5f2f5181e9
CLOUDSTACK-4083 if a failure occurs while adding VM to another network (this should be the first vm in the subnet). The ip alias created as a part of this process is not removed.
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-08-08 10:31:15 -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
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
9bb0eda5a1
Fix license
2013-08-02 14:05:01 -07:00
afd5d555f6
Create Private Network Test
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-02 13:34:44 -07:00
8930cfa983
Switched over to use the new jobs framework
2013-08-02 11:07:55 -07:00
21f1b137cb
Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
...
Reviewed-by: Alena Prokharchyk
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -07:00
46e644e134
Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used
2013-07-29 19:13:31 -07:00
2f369973e2
CLOUDSTACK-3779: Support System vm scaling on VMWare
...
Marked the system template new system template as dynamicallyScalable
- handled upgrade case
- moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
8ef097ef6e
CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
...
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
a8ad908666
CLOUDSTACK-3703: change service offering of stopped vm on
...
Conflicts:
server/test/com/cloud/vm/UserVmManagerTest.java
2013-07-27 19:52:30 +05:30
Min Chen
Murali Reddy
Hugo Trippaers
Alena Prokharchyk
Devdeep Singh
Kishan Kavala
Nitin Mehta
Alex Huang
Antonio Fornie
Jayapal
Bharat Kumar
Prachi Damle
Rajesh Battala
Rajani Karuturi
Edison Su
Sheng Yang
Darren Shepherd
Anthony Xu
dhoogland
Laszlo Hornyak
Daan Hoogland
Kelven Yang
Wei Zhou
Ian Duffy
Prasanna Santhanam
Chiradeep Vittal
Daan Hoogland
Harikrishna Patnala