Edison Su
63c3634b79
refactor attachvolumetoVM
2012-08-19 22:43:59 -07:00
Edison Su
87678b8525
refactor createcommand
2012-08-16 19:48:04 -07:00
Edison Su
5ba4913f63
refactor
2012-08-15 17:44:30 -07:00
Alena Prokharchyk
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
kishan
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
Anthony Xu
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
Kelven Yang
04bf1a33c6
apply patch https://reviews.apache.org/r/6572/
2012-08-13 17:28:41 -07:00
Alena Prokharchyk
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
Alena Prokharchyk
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
Alena Prokharchyk
62526a715a
Fixed unitest
2012-08-13 16:20:09 -07:00
Alena Prokharchyk
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
tomoe@midokura.jp
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
Nitin Mehta
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
Mice Xia
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
anthony
822cf3c9ee
VPC : typo in FirewallRuleVO
2012-08-12 10:55:21 -07:00
Alena Prokharchyk
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
Koushik Das
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Sheng Yang
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
Sheng Yang
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
Sheng Yang
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
Sheng Yang
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
Edison Su
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
Alena Prokharchyk
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
Alena Prokharchyk
5c349dd5e5
Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places
2012-08-10 10:45:38 -07:00
Mice Xia
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
Mice Xia
bd2a130251
fix unittest SecurityGroupManagerImpl2Test
2012-08-10 16:01:43 +08:00
Alena Prokharchyk
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
Alena Prokharchyk
3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Alena Prokharchyk
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049f48839dc364eefd32cd5597ac05bdc.
2012-08-08 15:26:45 -07:00
Alena Prokharchyk
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Alena Prokharchyk
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Alena Prokharchyk
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
Mice Xia
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
Sheng Yang
2641b5d6b8
S2S VPN: Fix multiply remote side guest networks
2012-08-07 18:39:45 -07:00
Alex Huang
c1c952b42b
should have used non url safe
2012-08-07 16:58:16 -07:00
Sheng Yang
5e0eb93fe6
S2S VPN: CS-15882: Only allow VPN connection between same account's gateways
2012-08-07 16:27:04 -07:00
Alex Huang
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
Sheng Yang
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
Alena Prokharchyk
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
Alena Prokharchyk
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
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