18040 Commits

Author SHA1 Message Date
Anthony Xu
19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
Alena Prokharchyk
b0a9adeffe Advance SG enabled zone. Moved following db upgrade change from 40-41 to 41-42 db upgrade path:
Adnvace Zone with SG enabled: DB upgrade for Advance SG enabled zone - setup name/displayText for Guest Shared SG enabled network (it used to be system network, and name was never set for it in 2.2.x)
2013-05-28 10:51:12 -07:00
Hiroaki KAWAI
cfd8056c14 remove a call path that cause NullPointerException
QemuImg.convert expects the arguments not null.
2013-05-28 20:54:01 +09:00
Prasanna Santhanam
4a563b64ee CLOUDSTACK-2713: StoragePoolResponse for a createTemplate
createTemplate returns a templateresponse and not a storagepool
response. Correcting the mapping to fix API docs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 16:37:23 +05:30
Prasanna Santhanam
75a8c1ca88 CLOUDSTACK-2712: updateHvCapability mapped to serviceOfferingResponse
response object of updateHypervisorCapabilities is set to
ServiceOfferingResponse

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 16:22:06 +05:30
radhikap
565d740e5d fixing build error 2013-05-28 15:00:07 +05:30
radhikap
8ebf2ca3d7 CLOUDSTACK-2709 2013-05-28 14:40:47 +05:30
Prasanna Santhanam
a0d5b78e84 CLOUDSTACK-2708: AutoScale listConditions response wrongly mapped
AutoScale - listConditions was mapped to CounterResponse instead of
ConditionResponse

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 14:14:19 +05:30
Pranav Saxena
b03e419bf9 Merge branch 'ui-vpc-redesign' 2013-05-28 13:21:22 +05:30
Wei Zhou
2e8d1264a2 CLOUDSTACK-2707: use executeBatch instead of persist when Usage Server createNetworkHelperEntry 2013-05-28 09:43:23 +02:00
SrikanteswaraRao Talluri
8fd476e2fd CLOUDSTACK-2557: Fix add primary storage tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 11:17:42 +05:30
ashutoshkelkar
204bdac77f Fix for repeated log lines in test case logs.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-28 11:15:57 +05:30
Hiroaki KAWAI
e9a6d47316 agent: fix network.bridge.type to be optional
New network.bridge.type was introduced, but for
buckward compatibility, the key should be optional.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-05-28 11:56:42 +09:00
Murali Reddy
883333c214 CLOUDSTACK-2700:on network/vpc delete, portable IP should be still
associated with account

Unlike public ip which gets dis-associated (released) with the account
on network/VPC delete, portable IP should continue to be associated with
the account even when the network/VPC with which it is currently
associated in deleted. This fix ensures portable IP are associated to
account even after network/vpc is deleted.
2013-05-27 18:44:41 +05:30
Murali Reddy
ad48c83808 generate an action event when portable IP association is transferred
from a network to different network
2013-05-27 18:44:41 +05:30
Harikrishna Patnala
82974458a6 CLOUDSTACK-2672: Adding isVolatile parameter in service offering response object
Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-05-27 18:25:29 +05:30
Milamber
fac59a7429 Update L10N strings from Transifex to repo 2013-05-27 09:58:46 +01:00
Nitin Mehta
a688d63104 CLOUDSTACK-2689
Create volume after upgrade from snapshot taken in 2.2.14 deletes the snapshot physically from sec. storage. Added DB upgrade sql to make swift_id NULL if they are set to 0
2013-05-27 14:16:16 +05:30
Nitin Mehta
08ac8fb468 CLOUDSTACK-2688
Add DB index to Alert.last_sent column to speed up listAlertsCmd.
2013-05-27 14:02:17 +05:30
Mice Xia
cc2866c1ea CLOUDSTACK-2686 Upload volume to project is not shown in project storage view 2013-05-27 15:48:09 +08:00
Hiroaki KAWAI
a16b707250 CLOUDSTACK-2327: make cloud-setup-agent ovs aware
Ovs brcompat will be obsolete, so if network.bridge.type was
set to openvswitch, we'll use ovs command explicitly.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-05-27 16:30:32 +09:00
Wido den Hollander
6758d727a4 debian: Package server.xml and tomcat6.conf
This are symlinks to server-nonssl.xml and tomcat6-nonssl.conf, but
they are required for starting the management server.

Commit 2db7a4559e64e34b5c707157db240a1be322cb69 broke this.
2013-05-27 09:05:04 +02:00
Hiroaki KAWAI
8744d1cdf6 CLOUDSTACK-2406: fix UI strings
Japanese properties file was broken, fixed manually.
We need to let the servlet container the encoding to use.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-05-27 15:52:23 +09:00
radhikap
77c52f5ebb remove the 256 limit (multiple ip per nic- now unlimited) 2013-05-27 11:50:18 +05:30
Hiroaki KAWAI
f854f5df87 fix debian packaging
nfs-common is required for a basic NFS installation both in
management server and agent.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-05-27 14:54:07 +09:00
Prasanna Santhanam
16e9eaca80 unskipping skipped tests
and indentation fixes

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-27 10:10:01 +05:30
Prasanna Santhanam
61e150fd58 More non-ascii encoded characters in commented text
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 20:10:46 +05:30
Prasanna Santhanam
a4a50a0b53 Remove unused setup script
- All the setup is now done by the tests and there is no need for a
  setup script to seed test data.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 15:32:17 +05:30
Wido den Hollander
2db7a4559e debian: Only package specified configuration files for management
Otherwise we will have duplicate / conflicting files with the AWSAPI package
2013-05-26 12:00:52 +02:00
Prasanna Santhanam
f13a3c5d32 More tests using the dsl iso
Replace dsl iso with dummy iso to speed up test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 15:29:45 +05:30
Prasanna Santhanam
1df3aad9ab Use a dummy ISO and skip SSH check
- Using the dummy.iso to speed up the test
- Removing ssh that is not required.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 15:26:33 +05:30
Wido den Hollander
322db71eed agent: Only probe running VMs for the current Hypervisor Type
Otherwise we try to probe for LXC VMs on a KVM hypervisor and vise versa.
2013-05-26 11:38:41 +02:00
Prasanna Santhanam
5b902c7005 CLOUDSTACK-2683: DevCloud systemVMs fail to launch
DevCloud is a XCP Kronos based xen. For this we use the XcpOssResource
whose memory limits were not set explicitly. Instead the base
CitrixResourceBase would set the limits. static_min was set to 128MB
failing the cpvm and ssvm start fails whose offerings have 100MB set to
the max limits.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 14:49:52 +05:30
Hiroaki KAWAI
dc822a83d7 fix debian packaging
*.in files must be processed by ReplaceTokens fliter.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-05-26 00:45:37 +09:00
Rohit Yadav
51879dd958 INSTALL: Update INSTALL.md with newer links
- Fix Maven 3.0.5 link
- Remove references of incubating, we are TLP now :)
- Fix github mirror link and git clone url

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-05-25 20:44:59 +05:30
Rohit Yadav
056e8fb533 cli: Make cachemaker.py pep8 compliant
Fixes object comparision to use a "is" b instead of ==

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-05-25 20:32:10 +05:30
Prasanna Santhanam
a4356b559c More fixes to regression tests:
- Remove extraneous non-ascii chars
- cloudconnection is auto GCed. No explicit cleanup required.
- Add environment tags for shared network tests
- Invalid account.account references
- Indentation errors
- Skip the storage motion test on unsuitable host environment
- remove copy template test. covered in the smoke tests
- invalid keys in service dictionary
- Unskipping tests skipped tests
-
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-25 15:40:42 +05:30
Sheng Yang
a21a4e5ac4 CLOUDSTACK-2682: Sleep 1 second before switch to BACKUP
To prevent backup.sh preempt master.sh when keepalived switch to MASTER then
back to BACKUP immediately.

Since it would take at least 3 seconds for BACKUP to switch to MASTER(vrrp
timeout), the fix won't cause chaos when keepalive try to switch to MASTER.
2013-05-24 17:10:55 -07:00
Sheng Yang
e3a3286758 CLOUDSTACK-2681: Suppress failed to apply port forwarding rule error when rollback 2013-05-24 17:08:31 -07:00
Sheng Yang
a1437ae82e CLOUDSTACK-2563: Network ACL: Allow protocol 1(icmp) paired with icmp type/code 2013-05-24 16:46:44 -07:00
Jessica Wang
d99fae07c7 CLOUDSTACK-747: Infrastructure menu - service providers - change display name of internalLbVm to be Internal LB VM. 2013-05-24 16:36:45 -07:00
Jessica Wang
7cc1e82210 CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Release Dedicated VLAN Range action - change label and message. 2013-05-24 16:17:39 -07:00
Jessica Wang
11a7e46dfb CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Dedicated Guest VLAN Range tab - implement Release Dedicated VLAN Range action. 2013-05-24 15:45:10 -07:00
Jessica Wang
b247ba6b4f CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - devailView - (1) add new tab "Dedicated VLAN Ranges" that list dedicated Guest VLAN Ranges under the physical network. (2) implement "Dedicate Guest VLAN Range" action. 2013-05-24 15:24:00 -07:00
Alena Prokharchyk
2ecf9e3293 CLOUDSTACK-2680: Async job expunge thread - expunge only:
1) Unfinished jobs that are yet to be processed.
2) Completed jobs

The jobs that are in process, will be skipped by the expunge thread

Conflicts:
	server/src/com/cloud/async/dao/AsyncJobDao.java
	server/src/com/cloud/async/dao/AsyncJobDaoImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-05-24 15:01:12 -07:00
Brian Federle
2a966f35ff Another fix for before: {} block 2013-05-24 13:10:31 -07:00
Brian Federle
72fa89eb7a Fix for dashboard items without before: {} block 2013-05-24 13:07:42 -07:00
Brian Federle
cd7287a4e1 Site-to-site VPN UI: Show confirm dialog if no gateways exist 2013-05-24 13:06:51 -07:00
Brian Federle
6f65a5bbe7 Update gitignore 2013-05-24 12:07:13 -07:00
Brian Federle
489396940e Update gitignore 2013-05-24 12:06:58 -07:00