Rohit Yadav
6482e27081
ApiDiscovery: Add mockito, unit test for ApiDiscovery service impl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
Rohit Yadav
26d8113f99
plugins: Indentation fix for pom.xml, add build/test rules for api discovery
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
Rohit Yadav
179db40e3a
ApiDiscovery: Fix response and service impl to make them test-able
2013-01-22 14:28:30 -08:00
Chip Childers
45d21c3202
Devcloud config for basic zone + management server.
...
Added a devcloud config that supports having the management
server run within devcloud, using the basic zone setup.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-22 16:44:34 -05:00
Edison Su
e4e2cf6be7
skip test in cloud engine
2013-01-22 13:25:48 -08:00
Edison Su
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
Prachi Damle
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
Prachi Damle
2adce8e712
Fixes to VO stuff
2013-01-22 12:54:22 -08:00
Prachi Damle
1cb0ce44df
Removing BareMetalService referrences. We will load UserVMService by default.
2013-01-22 12:54:20 -08:00
Prachi Damle
434c21a149
Fixing Merge error
2013-01-22 12:54:18 -08:00
Prachi Damle
02185d4240
VO should not contain any DAO. Transient should be loaded by the caller using the Dao.
2013-01-22 12:54:16 -08:00
Prachi Damle
3cc9f3ff06
Adding defaults to new columns
2013-01-22 12:54:12 -08:00
Prachi Damle
ef4d04f289
Removing the alter table statement - data_center already has a removed column
2013-01-22 12:54:09 -08:00
Prachi Damle
e6cd47ddc0
More changes for deployVM flow.
2013-01-22 12:54:07 -08:00
Prachi Damle
94e8090bf3
Deploy, Start, Stop, Destroy VM orchestration service changes
2013-01-22 12:54:04 -08:00
Alex Huang
ee39ec82d3
Making unit tests work
2013-01-22 11:18:51 -08:00
Marcus Sorensen
2e14cf5b57
Summary: Allow for same vlan num on different physical NICs
...
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.
BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
2013-01-22 12:05:55 -07:00
Rohit Yadav
22e70f2c8e
devcloud: Update a working p.a.o url in devcloud.sql
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 10:55:05 -08:00
Min Chen
2130a418e0
Formatting db view sql creation, and also addressed FIXME in Hugo's
...
change.
2013-01-22 10:08:57 -08:00
Hugo Trippaers
3bac7b8c07
Summary: Fix schema-40to410.sql
...
Applied some formatting
Changed invalid comment
Added workaround for non existing table vm_template_iso
Fix non prefixed table names in views
Removed 'use cloud' statement
2013-01-22 11:01:22 +01:00
Pranav Saxena
fe994a6e63
CLOUDSTACK-1027: Update SSL certificate button should properly reflect it's functionality:Changing the label and adding the title tag
2013-01-22 15:09:28 +05:30
Pranav Saxena
b867609df8
CLOUDSTACK-1027: Update SSL certificate button should properly reflect it's functionality:Changing the label and adding the title tag
2013-01-22 15:05:32 +05:30
Edison Su
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
Edison Su
3251cd665b
add test case for create storage pool
2013-01-21 16:59:51 -08:00
Edison Su
b4988e86ab
add backedn code
2013-01-21 16:59:50 -08:00
Jessica Wang
635ac34d06
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step5 - select network step - desc field - append '(sg)' if a network includes security group service.
2013-01-21 16:02:39 -08:00
Jessica Wang
ff5477d1f1
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - remove obsolete variable(myNetworks), rename variable sharedNetworks to networkObjs.
2013-01-21 15:53:29 -08:00
Jessica Wang
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
Min Chen
6e40c33628
CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
...
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
Brian Federle
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
Min Chen
6db719d58b
CLOUDSTACK-355: Create DB view to fix count issue for
...
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
Alex Huang
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
Alex Huang
f27692aa7a
Removed a useless class?
2013-01-21 10:25:58 -08:00
Hugo Trippaers
a0373fe1ff
Summary: Apply feedback from Wido
...
Better checking on VlanID
Correct speling mistake
2013-01-21 12:34:20 +01:00
Hugo Trippaers
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
Hugo Trippaers
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
Hugo Trippaers
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
Kelven Yang
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
Kelven Yang
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
Rohit Yadav
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
Rohit Yadav
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
Rohit Yadav
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
Rohit Yadav
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
Rohit Yadav
e688fbfc24
ScriptRunner: Alternate constructor to get verbosity flag
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:07:37 -08:00
Marcus Sorensen
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
Rohit Yadav
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
Jessica Wang
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
Alex Huang
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
Alex Huang
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
Edison Su
224621197c
add misssing files
2013-01-18 15:39:37 -08:00