John Burwell
f508bcaae9
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-07-23 18:38:43 -04:00
John Burwell
a2af4b5db7
- CLOUDSTACK-2583: PEP-8 compliance for s3xen
2013-07-23 18:37:51 -04:00
Sheng Yang
8295cb0ac2
CLOUDSTACK-3250: Add PvlanSetupCommand into maintenance mode allowed command list
...
Then the rule in the old host can be cleared.
2013-07-23 15:19:34 -07:00
Anthony Xu
089cbb610b
when create local link netowrk fails for xenserver, adding host should fail
2013-07-23 15:19:05 -07:00
Brian Federle
dfdbf20b67
Add disallowSpecialCharacters to some fields
2013-07-23 15:12:58 -07:00
Jessica Wang
2b5484cc31
CLOUDSTACK-2569: UI > Infrastructure menu > zone > physical network > network service provider > Cisco VNMC > Cisco VNMC Provider - display State as Absent if Cisco VNMC provider doesn't exist.
2013-07-23 15:10:32 -07:00
Min Chen
956e8301c2
CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes
...
table and volume_store_ref.
Conflicts:
server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-23 15:06:34 -07:00
John Burwell
529ac6f129
- CLOUDSTACK-2583: Backports the s3xen plugin to Python 2.4
2013-07-23 18:02:49 -04:00
Jessica Wang
9fb71c30a8
CLOUDSTACK-2569: UI > Infrastructure menu > zone > physical network > network service providers > Cisco VNMC > If Cisco VNMC provider doesn't exist, show Add action and hide enable, disable action.
2013-07-23 14:50:51 -07:00
Alena Prokharchyk
57623832b0
CLOUDSTACK-3478: fixed volume destroy. #1 - don't call destroy() when the volume is in Expunged/Expunging/Destroy state. #2 - added state transition for Expunged state
2013-07-23 14:40:59 -07:00
Sowmya Krishnan
1898fa5046
CLOUDSTACK-3693 Fix more account objects
2013-07-23 13:59:20 -07:00
Sowmya Krishnan
c6ea21866e
CLOUDSTACK-3697 LB rule clean up already done in cleanup project
2013-07-23 13:59:15 -07:00
Sheng Yang
7faa71dc68
Automation: Fix different names for cleanup
2013-07-23 13:15:07 -07:00
Sheng Yang
c1e6968464
Automation: Fix typo in test_redundant_network_rules
...
It result in failed to setUp and clean up.
2013-07-23 12:22:14 -07:00
Sheng Yang
5b238fa4af
Automation: Fix enormous missing tearDown() for test cases
...
This result in countless test case failure because many test case units didn't
clean up after it.
The regression test result should be improved quite a bit after this change.
2013-07-23 12:10:37 -07:00
ilya musayev
2cf8ecd3e2
Test commit - apache auth
2013-07-23 14:43:32 -04:00
ilya musayev
cfad7975f6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-07-23 14:42:02 -04:00
ilya musayev
47e346abd6
Test commit - apache auth
2013-07-23 14:41:17 -04:00
Jessica Wang
c02e802170
CLOUDSTACK-2760: UI > Infrastructure menu > System VMs > fix a bug that Agent State was not mapped correctly between systemVMs and hosts.
2013-07-23 11:34:22 -07:00
Alena Prokharchyk
3962f117ac
CLOUDSTACK-3733: fixed migrateVm - no need to cast vm to user vm to retrieve the iso information. Extract iso information from VirtualMachineProfile object passed to the method.
...
Conflicts:
server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-23 11:04:39 -07:00
Sanjay Tripathi
5c45645932
CLOUDSTACK-3724: Test case "test_vpc_vms_deployment.py" failed to find network offering.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit a06b3f40eb )
2013-07-23 21:40:52 +05:30
Wei Zhou
9985a895a4
CLOUDSTACK-3734: remove wrong break in 'for' block in VirtualMachineManagerImpl.java
2013-07-23 17:37:39 +02:00
Ian Duffy
06484061f3
add midterm review
2013-07-23 11:29:31 -04:00
Sowmya Krishnan
d2ce17ea73
Fixed account objects CLOUDSTACK-3726
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1cd435e25a )
2013-07-23 20:51:16 +05:30
Sanjay Tripathi
a7084b2dac
CLOUDSTACK-3727: Resource Count calculation happens for deleted accounts on restart of managment server.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-23 20:25:15 +05:30
Likitha Shetty
7e87221372
CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError.
...
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
2013-07-23 18:44:39 +05:30
Sanjay Tripathi
3e6e66fee1
CLOUDSTACK-3689: Test case test_accounts.TesttemplateHierarchy.test_01_template_hierarchy failed during ListTemplate call.
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 6b2c9bf3ae )
2013-07-23 18:02:29 +05:30
Prasanna Santhanam
63cf7aa8ce
CLOUDSTACK-3678: Multiple fixes to shared network tests
...
- No need to cleanup offerings as they are lightweight entities
- Cleanup order changed to clean accounts, networks and then the domains
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c44fa2cc20 )
2013-07-23 18:02:29 +05:30
Prasanna Santhanam
821bbe0610
CLOUDSTACK-3728: same issue as CLOUDSTACK-3719
...
Make the size explicit parameter to random_gen() for snapshot data
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 874d59847aa6bfd12e6967891a21f1746987b566)
2013-07-23 18:02:29 +05:30
Saksham Srivastava
89b94bb754
CLOUDSTACK-3382. Alert should be raised if a vm is migrated from dedicated to non-dedicated resource and vice versa.
...
Alerts are generated for VM migration between:
1) Source host is dedicated and destination host is not.
2) Source host is not dedicated and destination host is dedicated.
3) Both hosts are dedicated to different accounts/domains
2013-07-23 13:38:14 +05:30
Radhika PC
f5023af298
CLOUDSTACK-3546, CLOUDSTACK-3548, CLOUDSTACK-3549
2013-07-23 11:44:51 +05:30
Prasanna Santhanam
4585e46a35
CLOUDSTACK-3719: wrong declaration of random_gen call
...
since random_gen can take an id to prepend a testcase identifier to the
created cloud resource, we need to explicitly specify the size param. In
vmsnapshot test create the random_data string of size (100)
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 5bb3a56acac440b022ed6c45f97d0d85dcc94b96)
2013-07-23 11:39:08 +05:30
Devdeep Singh
7dec27e844
CLOUDSTACK-3708, Migration of a volume attached to a running instance isn't working (Storage motion).
...
The request to migrate was coming till ancient data motion strategy but wasn't worked on and forwarded
to the resource. The code probably got removed by a bad merge. Bringing it back.
2013-07-23 10:49:51 +05:30
Alex Huang
51377c40f2
Forgot to populate a method to called advanceStop
2013-07-22 20:06:05 -07:00
Alex Huang
5297a071d2
Changed virtual machine stop to use uuid
2013-07-22 20:06:04 -07:00
Alex Huang
319d91e1c2
Removed the getByTypeAndId() method and replace it with getById method
2013-07-22 20:06:04 -07:00
Sheng Yang
9f15779f10
CLOUDSTACK-3643: Automation: Fix VPC test cases
...
Also add a timeout for network connection testings.
Ideally this timeout should be around 30s or even less, but keep it at 60s for
now for safe.
2013-07-22 18:45:39 -07:00
Min Chen
cc99a83d71
CLOUDSTACK-3716:NPE triggered in DownloadListener.
2013-07-22 17:26:33 -07:00
Min Chen
181fb03e7e
CLOUDSTACK-3716:NPE triggered in DownloadListener
2013-07-22 17:14:30 -07:00
Brian Federle
7974dfe8db
CLOUDSTACK-3660: Add isdynamicallyscalable field
...
Add isdynamicallyscalable field to storage -> create template dialog
2013-07-22 16:53:17 -07:00
Alex Huang
6ac361e6a2
Removed VM generic from VirtualMachineGuru. Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms
2013-07-22 16:32:59 -07:00
Brian Federle
c9fdee8f21
CLOUDSTACK-3710: Remove over-commit ratio fields from edit cluster UI
...
Removes over-commit fields as editable. This also removes the 'edit
cluster' action, as there are no longer any fields to edit.
2013-07-22 16:20:04 -07:00
Min Chen
db8b9ea53a
Remove CLOUDSTACK-3513 debugging messages.
2013-07-22 16:18:16 -07:00
Min Chen
0fb3286cb1
CLOUDSTACK-3513:[Automation] Failed to copy iso and template between
...
zones. Failed to pass generated copy url to DownloadCommand.
2013-07-22 16:17:56 -07:00
Anthony Xu
3d05fb0b3e
throw exception if stopping VM fails, then UI can show the error message in stead of fails silently
2013-07-22 16:14:01 -07:00
Brian Federle
7f59d6c9ee
CLOUDSTACK-2990: Before scape-up, present prompt to user if on VMware
2013-07-22 16:07:47 -07:00
Anthony Xu
eff27e1f83
don't update VM state if the state doesn't really change. updating VM state increases the update count, which might cause real VM update fail
2013-07-22 15:56:37 -07:00
Anthony Xu
668089d575
correct the log message
2013-07-22 15:56:11 -07:00
Amogh Vasekar
5ff83e9c31
Adding encryption flag
...
CLOUDSTACK-3308
UCS:DB: UCS Manager password should not get stored in plain text.
2013-07-22 15:45:17 -07:00
Anthony Xu
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