bfdec24de4
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - specify canusefordeploy parameter in listNetworks API when populating network list.
2013-01-21 15:52:10 -08:00
6e40c33628
CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
...
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
a4c413bc13
CLOUDSTACK-537: Fix for instance wizard
...
When using SG-enabled advanced zone, fix case where 'add guest
network' form shows up in select network step -- adding a guest
network via the wizard is not supported in this type of setup.
2013-01-21 14:30:56 -08:00
6db719d58b
CLOUDSTACK-355: Create DB view to fix count issue for
...
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
f27692aa7a
Removed a useless class?
2013-01-21 10:25:58 -08:00
a0373fe1ff
Summary: Apply feedback from Wido
...
Better checking on VlanID
Correct speling mistake
2013-01-21 12:34:20 +01:00
04f82623f6
Merge branch 'master' into cloud-agent-with-openvswitch
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2013-01-21 12:18:21 +01:00
a8fcc4f3d3
Summary: Add documentation for the KVM support for OpenVswitch
...
Modified the KVM installation instructions with an example on how to use
the openvswitch bridges.
Modified the Nicira NVP plugin documentation with support for KVM
Updated the Nicira NVP docs to mention that it can be configured using
the UI now.
2013-01-21 12:12:59 +01:00
04d93ef0aa
Use the user.home property instead of a bash thing. See
...
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
2013-01-21 11:56:53 +01:00
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
d056cd5cab
Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code
2013-01-18 19:15:32 -08:00
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
e70143c1dc
maven: Fix developer/pom.xml to use DatabaseCreator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:11:42 -08:00
03a3837d92
DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:09:04 -08:00
7fbe935c36
Transaction: Fix static, add method to reinit static datasource off a db props file
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:08:11 -08:00
e688fbfc24
ScriptRunner: Alternate constructor to get verbosity flag
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:07:37 -08:00
a65b584d18
Summary: Fix bridge parsing when bridge names are subsets of others
...
Detail: There are several places in the code that do a
"brctl show | grep bridgeName" or similar, which causes all sorts
of problems when you have for example a cloudVirBr50 and a
cloudVirBr5000. This patch attempts to stop relying on the output
of brctl, instead favoring sysfs and /sys/devices/virtual/net.
It cuts a lot of bash out altogether by using java File. It was
tested in my devcloud-kvm against current 4.0, as well as by the
customer reporting initial bug.
BUG-ID: CLOUDSTACK-938
Fix-For: 4.0.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 18:28:08 -07:00
6214b1d4bd
db.properties: adding other key value info for dbcreator to work in a generic way
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 17:19:55 -08:00
98a289020f
CLOUDSTACK-652: cloudstack UI - create network offering dialog - for both Isolated network and Shared network, show Elastic IP dropdown when StaticNAT is checked and StaticNAT provider is Netscaler.
2013-01-18 16:03:33 -08:00
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
224621197c
add misssing files
2013-01-18 15:39:37 -08:00
d13d67bdd9
CLOUDSTACK-459: cloudstack UI - create network offering dialog - update comment in code.
2013-01-18 15:11:46 -08:00
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
189c20b665
umount loop device. If patch disk created from loop, then need to umount it in loop device, otherwise, you can only create 7 routers on one kvm host
2013-01-18 14:27:40 -08:00
2955d58976
Fix "Count" for listSnapshotPoliciesCmd.
2013-01-18 13:55:11 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
e8c0c1a8ee
Avoid some m2e error in eclipse for imported project.
2013-01-18 11:36:09 -08:00
0333225e22
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-18 11:14:48 -08:00
a5ac88db88
CLOUDSTACK-938: Add missing checkbatchs2svpn.sh
2013-01-18 11:01:00 -08:00
c9921ea077
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - show network list first, then security group list. reviewed-by: Brian
2013-01-18 10:44:44 -08:00
77bc04b90f
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - Instance wizard UI: Support advanced zone with security groups
...
For advanced zones with SG enabled, show both the add guest network
step as well as the add security group step.
reviewed-by: jessica
2013-01-18 10:38:38 -08:00
5a865462e9
Merge branch 'api_limit'
2013-01-18 09:43:54 -08:00
ce4b49d30b
network-refactor merge: fix nonoss build
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-18 09:38:49 -08:00
e45a9f3aed
CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 17:20:51 +05:30
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
51c1ca7cbe
CLOUDSTACK-1010: Fix count issue for listHosts command
2013-01-18 16:13:25 +05:30
55e8965bd0
Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk
...
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.
BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 00:20:34 -07:00
a0bc5089d0
maven: disable awsapi by default, enable by -P awsapi profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 21:58:22 -08:00
593b60ca51
rat: Fix license on newly added files
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 21:37:24 -08:00
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
249dcde364
Add FactoryBean for VirtualMachineEntity to help implement dyanmic injection
2013-01-17 21:06:45 -08:00
ddf9c6586d
Transaction: cosmetics fix
...
The default data source assumption is that db server is on localhost, port 3306
and has user cloud and password cloud. The static variables rely on hardcoded
db.properties file only. We need to fix it
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 19:09:38 -08:00
e5507c3892
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
2013-01-17 18:55:14 -08:00
ddc53771bf
implement toURI
2013-01-17 18:49:50 -08:00
c4a11b9979
rename datastream to dataobject
2013-01-17 18:49:50 -08:00
4ca828c1d6
maven: disable awsapi by default, enabled by -P awsapi profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:40:59 -08:00
b45cdef5d9
DatabaseCreator: Process db props, sql and upgrade classes separately
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
Jessica Wang
Min Chen
Brian Federle
Alex Huang
Hugo Trippaers
Hugo Trippaers
Kelven Yang
Rohit Yadav
Marcus Sorensen
Edison Su
Sheng Yang
Chiradeep Vittal
Koushik Das
Kishan Kavala