9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
3298a481a8
For assignVM, marking older snapshots removed in db
2012-08-23 12:22:02 +05:30
6f26894eaf
Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters).
2012-08-23 12:13:53 +05:30
3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
a5248f1cfc
Fix for dns issue in multiple pods
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
b42a813ff1
bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh
...
status CS-16112: resolved fixed
Conflicts:
patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
2012-08-22 12:00:02 +05:30
0b31a0af62
[ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0
2012-08-21 16:27:57 -07:00
4bffd71d71
[ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch.
2012-08-21 16:27:54 -07:00
cd0004bb86
CS-16111 - DB upgrade; fixed foreign keys names
2012-08-21 15:38:17 -07:00
e252de4999
PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
...
Reviewed-by: Frank Zhang
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
2bf5c99bc6
CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-08-21 15:31:07 -07:00
7d0ad98c93
More logging to lock operations on the network
2012-08-21 15:25:17 -07:00
14dd3f07d7
Fixed line endings in VirtualNetworkApplianceManagerImpl
2012-08-21 15:24:44 -07:00
7aa7d6e39f
CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift.
...
Reviewed-by: Kishan
2012-08-21 13:46:18 +05:30
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
ac9dee94ac
fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180
2012-08-20 13:38:19 -04:00
86d49e7aa0
CS-16060: Firewall service should be excluded from conserve mode checking
2012-08-17 17:05:04 -07:00
a8efbcda58
S2S VPN: Fix license headers
2012-08-17 16:52:06 -07:00
1cfcefd2fb
CS-16043: Using network based router rather than account for RVR detection
2012-08-17 16:52:06 -07:00
ea6f3eb6f9
CS-14253: Apply IP when firewall rule is in place
2012-08-17 16:52:06 -07:00
4cb7a100c6
Revert "bug 14484: Apply existed firewall rules when associating IP"
...
This reverts commit b409615a32
2012-08-17 16:52:06 -07:00
9059740dc1
HA worker thread needs to have its own worker thread configuration
2012-08-17 12:59:52 -07:00
f8bd05a1e3
Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet
2012-08-17 09:43:34 -07:00
691be5c60e
bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
...
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
98ae204972
giving diff ip to VR
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-17 13:49:39 +05:30
48521e74e6
ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails.
...
Also, ELB feature using virtual router does not work and is deprecated currently.
2012-08-16 12:59:00 -07:00
ae5d22b4ab
bug CS-16036 ResourceManagerTest does not test what is says it tests
...
also fixes unit test failures
2012-08-16 12:11:41 -07:00
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
335730dc65
CS-15999: added nics to domain router api response
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-16 10:50:09 -07:00
0bf6de3eb2
CS-16030: set UUID when persist public ip address
2012-08-16 10:13:39 -07:00
72f896044d
bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link
...
Reviewed-by: Kishan
2012-08-16 15:53:00 +05:30
7e093a949d
CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously
2012-08-15 11:06:25 +08:00
fe3786341f
Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test
2012-08-14 13:47:04 -07:00
65c90227ae
bug CS-15648: For volumes created from snapshot, create usage event after successful volume
...
status CS-15648: resolved fixed
reviewed-by: Nitin
2012-08-14 11:58:07 +05:30
5060f98268
CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second
2012-08-13 17:45:38 -07:00
04bf1a33c6
apply patch https://reviews.apache.org/r/6572/
2012-08-13 17:28:41 -07:00
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
62526a715a
Fixed unitest
2012-08-13 16:20:09 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
71ead9ef4e
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
e74969fdec
VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-13 11:55:34 -07:00
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
822cf3c9ee
VPC : typo in FirewallRuleVO
2012-08-12 10:55:21 -07:00
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
ff773a8122
CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one.
...
Verified on XS 6.0.2
Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
2012-08-12 17:05:28 +05:30
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
d93c5d0531
VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-10 16:37:33 -07:00
327b4833ce
S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation
...
And subnets limitation for each customer gateway
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:24:35 -07:00
302c9048e8
S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
830aec3562
S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
263216caa5
Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
...
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
5c349dd5e5
Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places
2012-08-10 10:45:38 -07:00
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
bd2a130251
fix unittest SecurityGroupManagerImpl2Test
2012-08-10 16:01:43 +08:00
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049
2012-08-08 15:26:45 -07:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
da26302049
Initialize user context from AccountManager
...
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-08 11:17:01 -07:00
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
2641b5d6b8
S2S VPN: Fix multiply remote side guest networks
2012-08-07 18:39:45 -07:00
c1c952b42b
should have used non url safe
2012-08-07 16:58:16 -07:00
5e0eb93fe6
S2S VPN: CS-15882: Only allow VPN connection between same account's gateways
2012-08-07 16:27:04 -07:00
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
a83c753354
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
2012-08-07 11:24:04 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
0a2b6436dd
bug CS-15859: put a check on volume limit
...
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-07 10:47:54 +05:30
6e7b4bc07b
S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:32:18 -07:00
a8cbba9e82
S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection
...
The owner would be always same as VPC owner.
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
setup/db/db/schema-304to305.sql
2012-08-06 15:21:54 -07:00
70d704c786
S2S VPN: Allow name to be modified in updateCustomerGateway
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:20:33 -07:00
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
6eba8a818a
VPC: applyStaticRoutes - don't exclude static routes in Revoke state
2012-08-03 14:15:50 -07:00
78764c8b6e
License header updates for the server folder.
2012-08-03 09:41:27 -04:00
3c68f1f8e8
bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state
...
Reviewed-by: Kishan
2012-08-03 17:18:13 +05:30
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
befd6dd0c6
listVirtualMachines: implemented search by templateId/isoId
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/ListVMsCmd.java
2012-08-02 18:15:13 -07:00
Kelven Yang
Darren Shepherd
Darren Shepherd
Abhinandan Prateek
Alena Prokharchyk
Jayapal
kishan
Prachi Damle
Nitin Mehta
Edison Su
David Nalley
Sheng Yang
Chiradeep Vittal
Mice Xia
Anthony Xu
tomoe@midokura.jp
Koushik Das
Edison Su
Alex Huang
Sheng Yang
Chip Childers