Commit Graph

994 Commits

Author SHA1 Message Date
Alex Huang 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
Harikrishna Patnala d2739cde2e Fix file name in DnsMasqConfigCommand
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-03 20:43:42 +05:30
Harikrishna Patnala 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
Murali Reddy 2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Sateesh Chodapuneedi 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
Bharat Kumar 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
Bharat Kumar 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
Sheng Yang 2fc6054a9d Baremetal: Move list APIs to the correct location 2013-07-01 15:19:39 -07:00
Alex Huang 57bafc8fe9 Another merge from master. This is just getting laborious 2013-07-01 11:29:57 -07:00
Alex Huang 3cddc36b29 Fixed a problem with the jobcontext being null if it came from the admin port 2013-07-01 11:19:19 -07:00
Murali Reddy e07a8b3f51 CLOUDSTACK-3282:[GSLB] Unable to add multiple LB rules to same GSLB rule
-fixing regression due to adding GSLB monitor for GSLB service

-code to add/delete GSLB monitor and GSLB service-monitor binding is
made idempotenet so as to succeed if the resource exists.
2013-07-01 19:07:00 +05:30
Sateesh Chodapuneedi 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
Hugo Trippaers 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
Sateesh Chodapuneedi e8ea6b1abd CLOUDSTACK-3260
Fixing NPE.
2013-06-30 08:59:41 +05:30
Prasanna Santhanam bd784fb8ec Include license header for solidfire util
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 16:55:55 +05:30
Edison Su 49ded7e4a3 the plugin better not touch database 2013-06-29 15:09:43 +05:30
Prasanna Santhanam 57641d85f7 Set all templates/volumes to Ready in the simulator
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:53:41 +05:30
Prasanna Santhanam 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
Prasanna Santhanam 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
Prasanna Santhanam 085e8838e4 Fix typo in backupSnapshotCommand
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Prasanna Santhanam de38cd815f Fix typo in class name
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Sanjay Tripathi 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
Hugo Trippaers 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
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Hiroaki KAWAI 2091852175 CLOUDSTACK-212: migrate the namespace (network-ssp-plugin)
migrate the ssp plugin namespace from com.cloud to org.apache.cloudstack

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-28 18:10:28 +09:00
Fang Wang 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
Alex Huang 422d9b8daf Disabled ssp plugin because I don't have the db 2013-06-27 15:43:02 -07:00
Sheng Yang 7e44f81273 UCS: Add missing beans
Also move the API to the right place
2013-06-27 14:54:45 -07:00
Hugo Trippaers 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
Alex Huang 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
Donal Lafferty 4361418e41 Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V
Server 2012.
Remove existing Hyper-V plugin, because it does not work and is dead
code.
Remove references to existing Hyper-V plugin from config files.
Remove Hypervisor.HypervisorType.Hyperv special cases from manager code
that are unused or unsupported.
Specifically, there is no CIFS secondary storage class
"CifsSecondaryStorageResource".  Also, the Hyper-V plugin's
ServerResource is contacted by the management server and not the other
way around.
Add Hyperv-V support to ListHypervisorsCmd API call

Signed-off-by: Edison Su <sudison@gmail.com>
2013-06-27 11:46:02 -07:00
Alex Huang 262352a1c6 Another merge from master to bring over fixes to bugs that broke the bvt 2013-06-27 11:16:32 -07:00
Laszlo Hornyak 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
Hugo Trippaers 53d1ce75a1 CLOUDSTACK-728 Set vmspec extra config for the Nicira NVP vApp 2013-06-26 15:41:52 -07:00
Hugo Trippaers 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
Harikrishna Patnala 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
Nitin Mehta 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
Nitin Mehta 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
Hiroaki KAWAI 4b3c0128b4 Add missing ASL decl.
ssp mock api is also available under ASL2.0

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-26 13:19:54 +09:00
Hiroaki KAWAI 39ef9240e8 CLOUDSTACK-3194 fix stratosphere ssp plugin packaging
stratosphere-ssp plugin maven pom.xml has some bad settings
and client pom.xml requred dependency for it.
2013-06-26 12:36:01 +09:00
Alex Huang 1f0186aafe Removed all traces of casting 2013-06-25 17:20:39 -07:00
Alex Huang 0061f2c5cc Fixed all the asserts 2013-06-25 13:47:54 -07:00
Alex Huang 5bd65daa03 How did these things actually pass in master 2013-06-25 13:32:37 -07:00
Hugo Trippaers 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
Kelven Yang ef1ec1e3cd Enable nonoss building 2013-06-25 11:49:41 -07:00
Sateesh Chodapuneedi 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
Sateesh Chodapuneedi 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
Jayapal 1ab87ef4be CLOUDSTACK-3003 Fixed static route issue in vpc vmware 2013-06-25 18:43:00 +05:30
Hiroaki KAWAI 2d6369c826 CLOUDSTACK-2756: Stratosphere SSP plugin
Stratosphere SSP is an SDN solution which creates virtual L2
networks backed by vxlan and vlan. SSP will ask hypervisor to set a
specific vlan, then SSP will interact with openflow switches and
put vxlan/vlan translation flow rules.

This plugin provides SSP as "connctivity" service provider.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-25 15:31:40 +09:00
Hiroaki KAWAI f706f6757c Add class check before cast
DataTO might be one of SnapshotObjectTO, TemplateObjectTO
or VolumeObjectTO
2013-06-25 12:48:01 +09:00