8d21f49ec9
Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged
2013-07-03 15:01:23 -07:00
d2739cde2e
Fix file name in DnsMasqConfigCommand
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 20:43:42 +05:30
98c5fe3a8d
CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to dnsmasq configuration issue in case of multiple subnets in a vlan
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 16:59:21 +05:30
6aa9b2f356
CLOUDSTACK-3152 addVmwareDc API call fails if called more than once to add same VMware DC to same cloudstack zone.
...
Check if the associated VMware DC matches the one specified in API params. This check would yield success as the association exists between same entities (zone and VMware DC)
This scenario would result in if the API addVmwareDc is called more than once with same parameters. For such scenario, return success response with VmwareDatacenter object read from database. Also returns success if addVmwareDC is called agsin with same zone and VMwareDC where the zone already has resources added to it (clusters etc.)
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-02 17:31:09 +05:30
61bc6c8477
Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration issue in case of multiple subnets in a vlan
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:50 +05:30
160c8f361b
Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of vmware, Cloudstack-3240 corrected a mistake in the script name.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-02 12:00:30 +05:30
2fc6054a9d
Baremetal: Move list APIs to the correct location
2013-07-01 15:19:39 -07:00
57bafc8fe9
Another merge from master. This is just getting laborious
2013-07-01 11:29:57 -07:00
f980341808
CLOUDSTACK-3279 Need mechanism to detect if hotadd for cpu/memory is supported per a specific guest OS supported by VMware.
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-01 17:27:32 +05:30
40f38521c4
It makes more sense to print the task uuid than the task type in the trace message
...
Add retry counter to exiting pong command message
Some additional code cleanup courtesy eclipse save actions, thanks Alex
2013-06-30 12:10:59 +02:00
e8ea6b1abd
CLOUDSTACK-3260
...
Fixing NPE.
2013-06-30 08:59:41 +05:30
0dc5b0d29a
Don't report back resource state to ResourceManagerImpl
...
on adding sec. storage no need to report back to resourceManager since
the sc. storage is no longer a directly connected host.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
fd867d5afa
DataStore - provider, lifecycle, driver implementations for simulator
...
mock implementation to manage secondary storage related operations for
the simulator.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:52:16 +05:30
085e8838e4
Fix typo in backupSnapshotCommand
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
de38cd815f
Fix typo in class name
...
AsyncRpcConext -> AsyncRpcContext
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
1659ee225c
CLOUDSTACK-3082: System VMs are failed to start with Xen 6.2.0( Failing to create VIF's)
2013-06-29 05:39:33 +05:30
ed00427989
Improve logging for CitrixResourceBase by replacing e.printStackTrace
...
with s_Logger.error.
Automatic cleanup using the eclipse settings from Alex
2013-06-28 16:45:31 -07:00
99227f7b3e
SolidFire plug-in and related changes
...
SolidFire plug-in
SolidFire plug-in related
2013-06-28 16:59:21 -06:00
24499deb43
CLOUDSTACK-2384: Template created from snapshot error.
...
In DB, the backedUpSnapshotUuid format got changed.
This messed up the vmdk file path in template creation from snapshot
2013-06-27 17:34:32 -07:00
7e44f81273
UCS: Add missing beans
...
Also move the API to the right place
2013-06-27 14:54:45 -07:00
329c6eb4d3
Adding tracelogging to CitrixResourceBase xapi task handling.
...
Currently it is very hard to see which tasks are pending in cloudstack
that need to be executed by xapi. Ideally we would like to have a
central overview of all tasks centrally. But for now being able to
enable tracelogging should give some insight in what is going on.
2013-06-27 14:54:31 -07:00
3c2aa18500
Fixed the problem with buildapidocs. There are now too many jars but with 1.6 JRE, you can just specify the directory rather than each jar individually.
2013-06-27 13:57:37 -07:00
262352a1c6
Another merge from master to bring over fixes to bugs that broke the bvt
2013-06-27 11:16:32 -07:00
882e5fa4e0
FileUtil simplified
...
- writeToFile removed since no references to it
- readFileAsString replaced with FileUtils.readFileToString
- minor code duplication removed in dependent method getNicStats
- unit test added
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-27 11:08:03 -07:00
53d1ce75a1
CLOUDSTACK-728 Set vmspec extra config for the Nicira NVP vApp
2013-06-26 15:41:52 -07:00
98dc68d8c9
CLOUDSTACK-728 For Nicira NVP a specified port-group must be used,
...
instead of a dynamically configured one.
Refactor bits of the HypervisorHostHelper to better
support multiple BroadcastDomainTypes
Cleanup some parts of the code that was using tab indents and removed some dead code.
2013-06-26 15:41:52 -07:00
0d1f512728
CLOUDSTACK-3208: showing xenhost username and password details in plain text in logs when we pefrom removehost from CS
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 15:57:31 +05:30
ea7b4467d7
CLOUDSTACK-3050
...
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:45:57 +05:30
f90279d9bb
CLOUDSTACK-3050
...
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:44:48 +05:30
1f0186aafe
Removed all traces of casting
2013-06-25 17:20:39 -07:00
0061f2c5cc
Fixed all the asserts
2013-06-25 13:47:54 -07:00
5bd65daa03
How did these things actually pass in master
2013-06-25 13:32:37 -07:00
f74e635225
Setting the required version of libvirt to 10.0 for the openvswitch
...
support. This version actually supports setting the vlan tag on an
interface.
2013-06-25 12:21:25 -07:00
c36a952f15
CLOUDSTACK-1767 VMWare DVS - cannot use untagged portgroups
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-25 19:43:20 +05:30
b3927ffe96
CLOUDSTACK-1766 VmWare DVS vmware.ports.per.dvportgroup setting not used
...
Read the global configuration setting while configuring VmwareManager.
Also enabling autoExpand feature for supported distributed virtual switch versions.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-25 19:15:24 +05:30
1ab87ef4be
CLOUDSTACK-3003 Fixed static route issue in vpc vmware
2013-06-25 18:43:00 +05:30
f706f6757c
Add class check before cast
...
DataTO might be one of SnapshotObjectTO, TemplateObjectTO
or VolumeObjectTO
2013-06-25 12:48:01 +09:00
3174134b32
get nonoss built
2013-06-24 19:52:53 -07:00
049dd7242e
merge from head
2013-06-24 16:51:59 -07:00
7b7db0560c
merge is complete
2013-06-24 16:50:31 -07:00
e7c34793fe
Fix unit test issue in non-oss build, temporarily disable dipendency of external network-elements like F5, NetScalar
2013-06-24 12:19:02 -07:00
9121191f70
CLOUDSTACK-1578 vmware:Egress default policy configurable using network offering on vmware
2013-06-24 13:37:01 +05:30
6a7ae637dd
CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider
2013-06-24 13:37:00 +05:30
4254cb85ce
Fix errors caused by branch-merge in vmware-base module
2013-06-23 16:56:27 -07:00
59d7c94247
CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1
2013-06-22 16:04:55 +05:30
d22306344b
Baremetal: Fix permission deny to ipmi.py
...
The file cloudstack-oss.asf/client/target/cloud-client-ui-4.2.0-SNAPSHOT/WEB-INF/classes/scripts/util/ipmi.py
is not mark as executible, so we cannot execute it directly.
Involve "/usr/bin/python" for it. The position of python file maybe different in
the different machines.
2013-06-21 18:06:04 -07:00
759269fcd8
Baremetal: Fix API's packages and categories
2013-06-21 09:48:30 -07:00
041303cc67
Baremetal: Fix typo of BaremetaUserdataProvider
...
Should be "Baremetal" rather than "Baremeta"
2013-06-21 09:48:25 -07:00
a6a49490fb
Fix baremetal functionality
...
1. Baremetal doesn't have secondary storage, so we don't need check them.
2. The new "AddBaremetalHostCmd" hasn't been used by UI, so keep the validity
checking out for now. "AddHostCmd" would still works.
3. Baremetal haven't implemented multiple ip range feature(CLOUDSTACK-702),
return true for now for single range.
2013-06-21 09:47:07 -07:00
205722aabf
fix nonoss build
2013-06-20 10:47:19 -07:00
Alex Huang
Harikrishna Patnala
Sateesh Chodapuneedi
Bharat Kumar
Sheng Yang
Hugo Trippaers
Prasanna Santhanam
Sanjay Tripathi
Mike Tutkowski
Fang Wang
Laszlo Hornyak
Nitin Mehta
Jayapal
Hiroaki KAWAI
Kelven Yang
Abhinandan Prateek
Edison Su