Alena Prokharchyk
ee99d5ee8d
NescalerResource - added missing "return" statement
2014-03-14 09:45:27 -07:00
Hugo Trippaers
15b6860c68
Fix pom relative path
2014-03-14 14:55:26 +01:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Rajesh Battala
6a4927f660
Fixed all findbugs in hyperv plugin code
2014-03-14 17:36:43 +05:30
Rajesh Battala
4523f5d8de
CLOUDSTACK-6106 Agent side changes for VPC on Hyper-V
2014-03-14 17:36:43 +05:30
Rajesh Battala
1b4325d2c8
CLOUDSTACK-6106 supporting VPC VR on Hyper-V
2014-03-14 17:36:43 +05:30
Murali Reddy
7d20b08aa9
findbug fixes
2014-03-14 16:56:39 +05:30
Murali Reddy
81f6e66808
fix RAT check failure
2014-03-14 16:56:39 +05:30
Murali Reddy
9a97ba76d3
findbug fixes, added some comments, bug fixes
2014-03-14 16:56:39 +05:30
Murali Reddy
e487b24bb6
couple of bug fixes
2014-03-14 16:56:38 +05:30
Murali Reddy
36541a2f4c
adding distributed routing support for KVM OVS
...
some check style error fixes
2014-03-14 16:56:38 +05:30
Murali Reddy
423a748807
adds hypervisor script to convert JSON routing polcies (ACL) config in
...
to flow rules and applies them on the bridge
add event subscriber in OvsTunnelManager, that listens to
replaceNetworkAcl events. On event sends the updated policy info to all
the hosts in the VPC
2014-03-14 16:56:37 +05:30
Murali Reddy
2c7786992f
some bug fixes
2014-03-14 16:56:37 +05:30
Murali Reddy
e045883c52
introduce OvsNetworkTopologyGuru that has convinenace functions to
...
- get the hosts on which VPC spans given vpc id
- get the VM's in the VPC
- get the hosts on which a network spans
- get the VPC's to which a hosts is part of
- get VM's of a VPC on a hosts
introduces capability to build a physical toplogy representation of a
VPC. This json file is encapsulated in
OvsVpcPhysicalTopologyConfigCommand, and is used to send full topology
to hypervisor hosts. On hypervisor this json config can be used to setup
tunnels, configure bridge, add flow rules etc
Ovs GURU, to use different broasdcast scheme VS://vpcid.gerkey for the
networks in VPC that use distributed routing
each VIF and tunnel interface to carry the network UUID in other/options
config
2014-03-14 16:56:37 +05:30
Murali Reddy
e3ec12e5d0
-add check to ensure 'Connectivity' service provider specified in
...
createVpcOffering actually supports 'DistributedRouter' capability
- enable OVS to support 'DistributedRouter' capability
2014-03-14 16:56:35 +05:30
Murali Reddy
7c4443e233
-introduces 'DistributedRouter' as capability to 'Connectivity' service.
...
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
2014-03-14 16:56:35 +05:30
Devdeep Singh
2aff39f8c7
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
...
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Kelven Yang
5a75a3e1f9
Give graceful state transition period to live with race-condition on VM startup time
2014-03-13 16:59:56 -07:00
Min Chen
8ff94601f1
Merge branch 'rbac' to master
2014-03-13 16:42:22 -07:00
Alena Prokharchyk
6c23e201ad
1) More fixes for the problems found by findBugs
...
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
Min Chen
84a528fad6
Merge branch 'master' into rbac
2014-03-13 14:52:37 -07:00
Prachi Damle
1f6263dead
fix build for the juniper-contrail plugin
2014-03-13 13:50:36 -07:00
Alena Prokharchyk
90c485e5d6
Fixed some problems reported by FindBugs
2014-03-13 13:45:30 -07:00
Min Chen
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
Alena Prokharchyk
1b83698dac
deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only)
2014-03-13 10:23:34 -07:00
Kishan Kavala
6d4b979c4d
CLOUDSTACK-6122: LXC systemVms run on KVM. If they are not included in the VmState report, MS assumes that system Vms are not running. MS will stop these Vms and spin new ones. So on LXC hosts, KVM Vms also have to be included in the Vmlist
2014-03-11 23:49:28 +05:30
Marcus Sorensen
c874e20c24
CLOUDSTACK-6225: Check libvirt version and volume format before
...
adding flag VIR_STORAGE_VOL_RESIZE_ALLOCATE to resize volume
libvirt call
2014-03-11 11:13:12 -06:00
Sanjay Tripathi
c7d31fe288
CLOUDSTACK-4760 : Enabling GPU support for XenServer.
...
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.
This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Rajesh Battala
540d020aa5
CLOUDSTACK-6179 Execute VR commands on Virtual Resource when commands received to Hyper-V
2014-03-11 13:10:13 +05:30
Alena Prokharchyk
466825a167
Fixed nonoss build
2014-03-10 15:29:18 -07:00
John Kinsella
09c375379d
CLOUDSTACK-6204: removing realhostip dependency
...
Moving default transport for console proxy, SSVM to http.
See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.
jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.
Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -07:00
Mike Tutkowski
cb26b4c337
CLOUDSTACK-6170
2014-03-07 23:52:01 -07:00
Alena Prokharchyk
7b0c5cfcbe
Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class
2014-03-07 11:33:10 -08:00
Rajani Karuturi
4552ec6322
Fixed CLOUDSTACK-6210 LDAP:listLdapUsers api throws exception when we click on "Add LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE and a proper message is returned from the api call
...
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2014-03-07 16:57:13 +00:00
Min Chen
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
Anthony Xu
38c0dd87a9
vbdmectics may not exist after host reboot
2014-03-05 16:04:34 -08:00
Anthony Xu
ab1d3af460
Use seperate path to sync VM metadata for XS
...
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Mike Tutkowski
b06e66c50a
CLOUDSTACK-6170
2014-03-05 13:55:12 -07:00
Marcus Sorensen
e5449e29c9
CLOUDSTACK-6203: KVM Migration fixes. Moved migration to a thread
...
so we can monitor it and potentially take action to make migration
complete if admin has defined such.
2014-03-05 12:24:04 -07:00
Alena Prokharchyk
5a8d165afa
CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
...
Conflicts:
engine/api/src/com/cloud/vm/VirtualMachineManager.java
engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Marcus Sorensen
fb0b2eb267
CLOUDSTACK-6192: Return failure on StartCommand and PrepareForMigrationCommand
...
when connectPhysicalDisk fails, rather than continuing on
2014-03-04 14:18:51 -07:00
Wido den Hollander
1f9649bc3b
kvm: Fix a NullPointerException which occurs when storage pool creation fails
...
Also make the logging around creating a RBD storage pool a bit better when creating
that fails.
2014-03-04 16:03:11 +01:00
sbalineni
8dca59d4f9
mvn clean - cleanps up only target, dist directories; testclient.log file should be generated inside target directory
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-04 11:57:20 +01:00
Rajani Karuturi
9be51e1961
added mock handlers for VpnUsersCfgCommand and RemoteAccessVpnCfgCommand in the simulator
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-04 14:31:03 +05:30
Rajani Karuturi
8e2c4c8105
added delete iso api to the simulator in the smoke tests, this will fix test_03_delete_iso when run against a simulator
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-04 14:12:30 +05:30
wrodrigues
9045e41483
fix for Find Bugs findings on troubling issues: returning null when expected is boolean; adding 6 unit tests and fix 1 in the KVMFencer; comparing objects with == instead of equals()
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-03-03 07:57:13 +01:00
Kelven Yang
b21662f890
make sure XS report VM state even if there is no running VM on the host.
2014-02-28 15:35:59 -08:00
Kelven Yang
57a00a8172
Let ESX host timeout to reflect disconnect status in vCenter into CloudStack.
2014-02-28 15:35:59 -08:00
Kelven Yang
24e64ac62a
let PingTestCommand support host-ping in addition to ping user VM via VR. Reviewed-By: self
2014-02-28 15:35:59 -08:00
Kelven Yang
414b1cbb22
let KVM only report running VM to workaround the problem when KVM still keeps stopped-VM around in some cases
2014-02-28 15:35:59 -08:00
Kelven Yang
bfb7835a21
Temporarily disable event-based VM state management at XS resource level. Wait to enable it when other changes in XS is ready
2014-02-28 15:35:58 -08:00
Kelven Yang
18b5fb5a3c
do not shutdown alien VMs upon host startup. Send StopCommand for out-of-band stopped VM to restore legacy XS/KVM behave
2014-02-28 15:35:58 -08:00
Kelven Yang
90ea3249a8
disable cluster-scope report from XS resource
2014-02-28 15:35:57 -08:00
Jayapal
cb1c287433
CLOUDSTACK-6183: Unplug the nic when all the ips from the public subnet is released
2014-02-28 16:46:57 +05:30
Hugo Trippaers
a0f932437c
Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag
2014-02-27 09:51:02 +01:00
Min Chen
a6f17675d4
CLOUDSTACK-6175:s3.singleupload.max.size option not applicable for
...
backup snapshot on KVM.
2014-02-26 15:13:49 -08:00
Likitha Shetty
88b5761647
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live VM migration of an already migrated VM (with storage) across clusters fails
...
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
Update volume path for every volume belonging to the VM to the corresponding new disk filename.
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
2014-02-26 13:45:44 +05:30
Likitha Shetty
0926bf57f4
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live storage migration of an already migrated volume fails
...
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
If a volume has been renamed upon migration update its volumePath to that of the new disk filename.
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
2014-02-26 13:45:43 +05:30
Min Chen
b484b48201
Provide separate option for Windows Server 2012 R2 as
...
an OS type when registering template.
2014-02-25 16:09:29 -08:00
Mandar Barve
b0c6d47347
- Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging
...
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-25 22:59:10 +01:00
Wido den Hollander
abf3c055c2
templates: Add FreeBSD 10 template
...
With VirtIO enabled on KVM. FreeBSD 10 supports VirtIO for both the
network and the disks. This frees us from IDE and E1000 which should
also improve performance.
2014-02-25 14:56:24 +01:00
Niels de Vos
14689d7810
Gluster should store volumes in qcow2 format
...
By default all network disks are in RAW format. Gluster works fine with
QCOW2 which has some advantages.
Disks are by default in QCOW2 format. It is possible to run into
a mismatch, where the disk is in QCOW2 format, but QEMU gets started
with format=raw. This causes the virtual machines to lockup on boot.
Failures to start a virtual machine can be verified by checking the log
of the virtual machine, and compare the output of 'qemu-img info'.
In /var/log/libvirt/qemu/<VM>.log find the URL for the drive:
-drive file=gluster+tcp://...,format=raw,..
Compare this with the 'qemu-img info' output of the same file, mounted
under /mnt/<pool-uuid>/<img-uuid>:
# qemu-img info /mnt/<pool-uuid>/<img-uuid>
...
file format: qcow2
...
This change makes passes the format when creating a disk located on RBD
(RAW only) and Gluster (QCOW2).
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2014-02-25 12:08:46 +01:00
Hugo Trippaers
52c4f00b26
Findbugs: Fix potential NPE
2014-02-24 14:07:33 +01:00
Hugo Trippaers
6b61fd7d09
Fix CID 1186644: ES: Checking String equality using == or !=
2014-02-24 14:06:40 +01:00
Rajesh Battala
f960ada36e
CLOUDSTACK-6159 Fixed creating volumes(Root, DataDisk) with uuid in primary store
2014-02-23 09:21:30 +05:30
Alena Prokharchyk
e42e8762ea
Fixed allocatePublicIp call done from CiscoVnmcElement
2014-02-21 21:03:04 -08:00
Alena Prokharchyk
0f489732c8
Display flag support for LB/InternalLB/NetworkACL rules
2014-02-21 14:03:10 -08:00
Alena Prokharchyk
2f7bfc0c73
Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only
2014-02-20 17:15:42 -08:00
Marcus Sorensen
4fcd0b1a1f
if libvirt fails to attach disks, call disconnectPhysicalDisk to clean up
2014-02-20 15:43:27 -07:00
Niels de Vos
fe83a85436
Add support for Primary Storage on Gluster using the libvirt backend
...
The support for Gluster as Primary Storage is mostly based on the
implementation for NFS. Like NFS, libvirt can address a Gluster environment
through the 'netfs' pool-type.
2014-02-20 14:52:01 +01:00
Sheng Yang
5332f67ae8
CLOUDSTACK-6047: Make sure every commands to VR resource is NetworkElementCommand
2014-02-19 19:46:49 -08:00
Antonio Fornie
808c6df6d7
Fix and add some Rest unit and IT tests. Fix by adding a missing type of RoutingConfig.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-19 09:30:57 +01:00
Nitin Mehta
c969aa2595
CLOUDSTACK-6134:
...
If volume already exists for the vm - register the vm in the inventory and start it.
2014-02-18 18:24:33 -08:00
Hugo Trippaers
24309f6001
Prevent a ClassCastException when the answer is not a SetupAnswer (which happends when something goes wrong while connecting)
2014-02-18 12:37:36 +01:00
Hugo Trippaers
f1139848e5
Slight optimization, don't run checkstyle on container or non-java projects.
2014-02-18 12:24:11 +01:00
Antonio Fornie
510972abde
Nvp and rest refactoring and more tests
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-18 09:51:54 +01:00
Sheng Yang
6bde675f87
Remove SetupGuestNetworkAnswer
...
It's unnecessary and not different from Answer itself.
2014-02-14 18:10:05 -08:00
Sheng Yang
161e7d93ca
CLOUDSTACK-5779: Fix missing clean up period for VR
2014-02-14 18:10:00 -08:00
Hugo Trippaers
97bad4f9b3
Fix checkstyle and license issues
2014-02-14 18:37:47 +01:00
wrodrigues
3199de69fe
Fixes on Contrail and Mon InMemory plugins; adding comments about the changes.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:47 +01:00
Miguel Ferreira
8649fa005a
Fix findbugs findings in cloud-plugin-network-elb
...
Findings:
- comparing Longs by reference
- possible null pointer dereference
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:46 +01:00
Hugo Trippaers
ef2ced7564
Fix findbugs findings in cloud-plugin-network-ovs
...
OvsTunnelManagerImpl.java:456, RC_REF_COMPARISON, Priority: High
Serveral low priority fixes
2014-02-14 18:37:46 +01:00
Hugo Trippaers
9b841af529
Findbugs : A map can't retrieve an object by index, so get(0) would
...
return null. Changed to retrieve the first entry in the map.
Removed the ExecutionException try catch, this would prevent the
unittest from giving accurate information on exceptions. Avoid catching
checked exceptions in a unittest, use expected keyword on @Test instead.
2014-02-14 18:37:45 +01:00
Hugo Trippaers
d4d49578dc
Findbugs : Fix a number of potential NPEs and minor findings
2014-02-14 18:37:45 +01:00
Alex Hitchins
e0a4b7c891
Findbugs - Long equality fix.
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:45 +01:00
wrodrigues
0ff943337c
fixing FindBugs scariest for replaceFirst() method call that does not assign the return value
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:44 +01:00
Sander Botman
16aa73c2c8
Fixing some of the scary bugs possible null pointer: created testSetNicDevIdIfCorrectVifIsNotNull
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:44 +01:00
Likitha Shetty
db91e54bf3
CLOUDSTACK-6112. Adding VPC router to a guest network fails with StringIndexOutOfBoundsException.
2014-02-14 17:01:27 +05:30
Marcus Sorensen
df77c4310a
CLOUDSTACK-6103: Pass VM iso information along with
...
PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well.
2014-02-14 00:34:48 -07:00
Marcus Sorensen
7064972997
Fix someone's broken push due to bad checkstyle (VMwareGuru.java unused imports)
2014-02-12 16:26:33 -07:00
Likitha Shetty
9f597ef130
CLOUDSTACK-6056. Enabling static NAT rule for a portable public IP fails with error "Failed to enable static nat".
...
router.extra.public.nics isn't being honoured and so when an ip that is acquired from the additional VLAN range
is being configured it failed.
2014-02-12 15:53:45 +05:30
Anshul Gangwar
b86d45b003
CLOUDSTACK-6054: Changes for making vmsync work for hyper-v. Made changes to PingCommand and
...
StartupCommand to return the state of all vms on the host.
2014-02-11 12:19:41 +05:30
Darren Shepherd
c1cfaa2d1c
Contrail Event Interceptor fix
...
When project/domains are created, our plugin code won't get invoked. Our
contrail plugin uses Event infrastructure provided by cloudstack to
receive these events and handle them accordingly. It is must to create
domains/projects before creating a virtual network/vm object in contrail
implementation. Hence our plugin must need a way to get notified about
project/domain events.
2014-02-10 22:43:38 -07:00
Laszlo Hornyak
bdf50f6d24
Remove assertion
...
The assertion is built on the assumption that cpuinfo_max_freq is readable by user, which may not be universaly true.
2014-02-10 19:56:54 +01:00
Laszlo Hornyak
ab15653d68
Revert "Temporarily ignore getCpuSpeed test"
...
This reverts commit e4a91d3610 .
2014-02-10 19:40:37 +01:00
Laszlo Hornyak
e4a91d3610
Temporarily ignore getCpuSpeed test
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 23:13:55 +01:00
Laszlo Hornyak
55b6b6d50b
Boolean expression simplification
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 19:19:20 +01:00
Laszlo Hornyak
d6a6e8dfa5
Minor Boolean expression simplification
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 19:05:28 +01:00
Laszlo Hornyak
74a3cb4d5e
String concatenation cleanup
...
Replaced string concatenation in loop with StringBuilder
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 19:01:45 +01:00
Laszlo Hornyak
8e3ae40ba2
removed self-assignment
...
It must have been a copy-paste from the other constructor.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 18:46:36 +01:00
Laszlo Hornyak
d22b65f45f
replaced Integer reference comparsion with .equals
...
By default only the Integers between -128..127 are cached (unless overridden by java.lang.Integer.IntegerCache.high system property)
If the inbound or outbound values are higher, the reference comparison won't work.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 18:39:03 +01:00
Laszlo Hornyak
3e3ded75f4
safely close resource with java 1.7 resource block
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 18:27:54 +01:00
Laszlo Hornyak
5e4fec9eca
removed unused variables
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 16:55:27 +01:00
Laszlo Hornyak
e52a276104
cleanup in LibvirtComputingResource
...
- minor resource leak cleaned up
- cpu-speed reading method extracted
- test added
- logging added in case of exception
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-09 16:50:10 +01:00
Min Chen
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
Hugo Trippaers
64c61c7202
Fix two NPE exceptions in the Contrail Plugin when contrail is not providing any services on the network.
2014-02-06 16:51:20 +01:00
Wido den Hollander
1baebebda6
test: Expand LibvirtDomainXMLParserTest with Interface test
2014-02-06 14:40:40 +01:00
Wido den Hollander
41c7e22eee
test: Add test for LibvirtDomainXMLParser
...
A couple of changes where made to other classes as well to add
some features to allow more extensive testing.
2014-02-06 14:23:25 +01:00
Rajesh Battala
7f780f26f9
Fixed agent code to handle untagged public vlan while parsing the vlan id
2014-02-05 23:44:14 +05:30
Syed Ahmed
356daf3eed
Review 16080 Move Netscaler plugin from non-oss to oss and upgrade the nitro API to 10.1
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-05 14:03:49 +01:00
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Hiroaki KAWAI
0d222b14a1
stratosphere-ssp plugin: Fix HttpClient4 connection leak
...
Replaced HttpClient#execute(HttpUriRequest) with
HttpClient#execute(HttpUriRequest,ResponseHandler<T>).
The former requires extra EntityUtils#consume(HttpEntity).
2014-02-05 16:23:32 +09:00
Alex Huang
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
Min Chen
929099518d
Fix trailing whitespace.
2014-02-04 15:42:39 -08:00
Min Chen
39efee285f
CLOUDSTACK-6027:CreateVolume from snapshot is failing with S3 on Vmware.
2014-02-04 15:08:28 -08:00
sbalineni
cc8bde2421
Do not initialize contrail plugin component functionality like db sync, network offerring creation when contrail is not installed
2014-02-04 12:35:29 -08:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Min Chen
9b21da65d1
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.
2014-02-04 11:01:51 -08:00
Daan Hoogland
0839fbce67
CLOUDSTACK-6023 vcpus should not be higher then xen specifies
2014-02-04 18:41:53 +01:00
Wido den Hollander
3989d6c481
kvm: Resize volumes using libvirt
...
This saves us a lot of code and libvirt is probably a better
place to do this.
libvirt-java now has the support we want, so we can now resize volumes
with libvirt.
(C)LVM volumes can't be resized using libvirt, so we have to
invoke a resize script for that.
2014-02-04 14:26:51 +01:00
Min Chen
30695d7f93
CLOUDSTACK-6019:CreateVolume from snapshot in NFS is throwing Warning
...
"sync snapshot from cache to region wide store failed for image store
test".
2014-02-03 16:41:04 -08:00
Wido den Hollander
5ae12f31b7
rbd: Set client timeout to 30 seconds.
...
By default the client_mount_timeout setting in librados is 300 seconds,
but that causes the connect to the Ceph cluster to block for 5 minutes
if the Ceph cluster is not available.
This patch is not ideal, but it mitigates the problem for now.
At a later point all this librados/librbd code should go back to libvirt
again, but the current versions of libvirt in the distributions are
to old for all the features we require.
For now this should prevent the CloudStack agent blocking for 5 minutes
when the Ceph cluster isn't available.
This is also tracked at the Ceph tracker: http://tracker.ceph.com/issues/6507
2014-02-03 16:07:00 +01:00
Hiroaki KAWAI
836a9caa72
add charset arg to InputStreamReader constructor
...
thanks to findbugs.
2014-01-31 12:57:13 +09:00
sbalineni
ed3e1b95b0
VPC Support for contrail networking
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-30 18:13:48 -08:00
Likitha Shetty
06f79a881c
CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade.
...
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
2014-01-30 18:31:38 +05:30
Hiroaki KAWAI
cb048f4108
Some rework stratosphere ssp plugin
...
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
2014-01-30 21:31:44 +09:00
Marcus Sorensen
05189361b7
CLOUDSTACK-5968 last patch fixes setting low currentMemory during
...
overprovision, this one explicitly tells libvirt we dont want a
balloon device (won't use it anyway, and will just suck up a percent
of vm memory)
2014-01-28 11:51:23 -07:00
Marcus Sorensen
1530c162e5
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
2014-01-28 10:44:44 -07:00
Hugo Trippaers
3bd38eb17e
Findbugs finding : Incorrect use of equality
2014-01-28 08:58:28 +00:00
Sachchidanand Vaidya
cc98125067
These are additional fixes to make Juniper Contrail plugin work
2014-01-28 08:58:22 +00:00
Likitha Shetty
4583bac05b
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
...
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
2014-01-28 09:21:05 +05:30
Rajesh Battala
39447cce6e
CLOUDSTACK-5941 User Vm deployment on HyperV is failing due to change in the userdata script location and moved to json model
2014-01-28 07:03:08 +05:30
Rajesh Battala
807dc09138
CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV
2014-01-28 07:03:08 +05:30
Marcus Sorensen
0502d2f375
CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
...
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Marcus Sorensen
daeea46da0
CLOUDSTACK-5956 remove persist flag during live migration
2014-01-27 11:04:05 -07:00
Laszlo Hornyak
884e8c6510
replaced Long instantiation with parseLong
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 16:11:51 +01:00
Sheng Yang
3c955c3659
CLOUDSTACK-5779: Make VmwareResource use VirtualRoutingResource
2014-01-24 19:57:52 -08:00
Sheng Yang
069bc3686e
CLOUDSTACK-5779: Make CitrixResource to use VirtualRoutingResource
2014-01-24 18:28:31 -08:00
Sheng Yang
285f23f11b
CLOUDSTACK-5779: Generalize calling to execute or create file for KVM
2014-01-24 18:28:25 -08:00
Sheng Yang
2d3022594c
CLOUDSTACK-5779: Generalize calling to execute or create file for Vmware
2014-01-24 18:28:00 -08:00
Sheng Yang
2d100f1269
CLOUDSTACK-5779: Generalize calling to execute or create file for Xen
2014-01-24 18:27:55 -08:00
Devdeep Singh
aab881be21
CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
...
password from the message string before writing to the log. Made a change to do so.
2014-01-24 15:04:00 +05:30
Prachi Damle
af14699c4c
fixing the build _ AffinityGroup command changes
2014-01-23 18:17:43 -08:00
Wido den Hollander
dad98ef4de
test: Add UnitTest for LibvirtSecretDef
2014-01-23 21:09:25 +01:00
Hugo Trippaers
50b6de4714
Findbugs finding : Fix potential NPE
2014-01-23 16:14:56 +00:00
Hugo Trippaers
5e0d61bf98
Findbugs finding: Fix object comparison with == instead of equals
2014-01-23 15:53:26 +00:00
Hugo Trippaers
5fc03211ff
Findbugs finding: the collections should have been made static
2014-01-23 15:52:46 +00:00
Hugo Trippaers
ecdee7da9a
Findbugs finding: Fix incorrect comparison, <VbdType>.equalsi(<String>) will always be false and should be <VbdType>.equals(<VbdType>)
2014-01-23 15:43:50 +00:00
Jayapal
4b3784a98e
CLOUDSTACK-5938 Failing add host in security group enabled zone, when CSP is not installed
2014-01-23 18:14:12 +05:30
Santhosh Edukulla
f999a01837
Added Fix for CLOUDSTACK-5875
...
Added fix for exception and listing. Mentioned details under bug.
Post the fix, simulator works fine.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Koushik Das <koushik@apache.org>
2014-01-23 17:11:33 +05:30
Devdeep Singh
538092b73e
Hyper-V agent should log to the event viewer. Changed the default
...
log appender for the agent.
2014-01-23 13:45:55 +05:30
Hugo Trippaers
c2da280347
Add a zipped version of the hyperv image that we can store in the archives on the jenkins server
2014-01-23 09:06:33 +01:00
Anshul Gangwar
b2de225f54
CLOUDSTACK-5703: putting rdp server port value in host details
2014-01-23 10:54:08 +05:30
Anshul Gangwar
5941ac46d2
CLOUDSTACK-5344 commit for console proxy rdp for hyperv
2014-01-23 10:54:08 +05:30
Wido den Hollander
5747b80124
test: Add UnitTest for Libvirt Storage Pool definitions
2014-01-22 21:52:39 +01:00
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Hugo Trippaers
49124bdb7d
Fix license formatting to work with the mycila license check for nvp and opendaylight
2014-01-22 11:24:37 +01:00
Hugo Trippaers
d3cd73d861
Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp)
2014-01-22 11:22:42 +01:00
Hugo Trippaers
7ab3e277c4
Cosmetics
2014-01-22 10:11:20 +01:00
Hugo Trippaers
532bf4b190
Get rid of compiler warnings and dead code in plugin-hypervisor-vmware
2014-01-22 09:55:38 +01:00
Alena Prokharchyk
202c18243b
Fixed unittest
2014-01-21 20:05:16 -08:00
Anthony Xu
cae19d0b5a
fix build
2014-01-21 19:34:54 -08:00
Sheng Yang
1767ddac77
CLOUDSTACK-5779: Update vmdata command in Vmware
...
To use Gson rather than copy a file to it, follow the same as Xen and KVM.
2014-01-21 18:59:30 -08:00
Anthony Xu
b79f949e1b
CLOUDSTACK-5923: CS doesn't do master switch for XS any more, CS will depend on XS HA to do master switch, XS HA needs to be enabled.
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
2014-01-21 18:54:53 -08:00
Alena Prokharchyk
ab627bc767
Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-01-21 17:45:53 -08:00
Wido den Hollander
f7ee27cd1c
test: Add Unit Test for LibvirtVMDef DiskDef
2014-01-22 00:04:29 +01:00
Sheng Yang
d4e069ecc8
Fix noredist build issue
...
Introduced by:
commit ac65f8fddf
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Mon Jan 20 18:03:02 2014 +0100
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select
switch name, type and vlan token. Change preference to use the tags set on the
physical network.
2014-01-21 11:31:40 -08:00
Mike Tutkowski
0846bfe1ff
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:10:54 -07:00
Sheng Yang
e88cc488e5
CLOUDSTACK-5779: Move loadbalancer to use routerProxy
2014-01-20 18:48:46 -08:00
Alena Prokharchyk
452c20b242
Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.
...
Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api ?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests
2014-01-20 13:37:52 -08:00
Hugo Trippaers
ac65f8fddf
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select switch name, type and vlan token. Change preference to use the tags set on the physical network.
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2014-01-20 18:09:01 +01:00
Mike Tutkowski
37332ad9d4
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-18 18:07:10 -07:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Sheng Yang
0ea1c7dfc4
CLOUDSTACK-5779: Move firewall to use routerProxy
2014-01-17 12:36:42 -08:00
Sheng Yang
ce67e24d0a
CLOUDSTACK-5779: Move ipAlias to use routerProxy
2014-01-17 12:36:42 -08:00
Devdeep Singh
e9e5b84747
CLOUDSTACK-5894: A template created from a volume on hyper-v became unusable after
...
the management server was restarted. The template.properties file created for the
template has the format field in upper-case. This caused the template service to
not to recognise the format and it removed the entry from the template_store_ref
table in db. Fixed the format field in the templatee.properties.
2014-01-17 19:17:17 +05:30
Saksham Srivastava
06f8c1de75
CLOUDSTACK-5692: obscure passwords when using cifs as storage
2014-01-17 14:00:24 +05:30
Likitha Shetty
008b029a29
CLOUDSTACK-5891.[VMware] If a template has been registered and "cpu.corespersocket=X" template details have been added for it,
...
then any instance deployed from that template should have X cores per socket
2014-01-17 11:00:48 +05:30
Sheng Yang
0cdf0f6f67
CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy
2014-01-16 16:03:09 -08:00
Sheng Yang
b703b43d7c
CLOUDSTACK-5779: Refactor mechanism for calling routerProxy in CitrixResource
2014-01-16 16:02:53 -08:00
Laszlo Hornyak
07f73ec054
Null-safety in http header handling
...
The http Content-Type header may not always be present in the response, in such cases the getResponseHeader will return null and this leads to NPE, therefore the presence of the header must be checked.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-17 00:19:17 +01:00
Edison Su
3f49f8ca61
Fix RAT
2014-01-16 12:10:38 -08:00
Mike Tutkowski
e9c9887ee0
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:20:54 -07:00
Mike Tutkowski
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
Anshul Gangwar
823abe6a23
CLOUDSTACK-5880: Communication between management server and hyper-v agent should be secure.
2014-01-16 14:48:28 +05:30
Jayapal
fcd21eb7f3
CLOUDSTACK-5747 Fixed network restart issue with SRX
2014-01-16 11:29:03 +05:30
Jayapal
a41c9b9631
CLOUDSTACK-5867 Fixed service monitor command path
2014-01-16 11:29:03 +05:30
Victor Rodionov
753b563947
NexentaStor iSCSI volume driver
...
This a NexentaStor iSCSI volume driver.
Now implemented only following functions:
* create volume
* delete volume
Currently delete volume still in progress.
Signed-off-by: Edison Su <sudison@gmail.com>
2014-01-15 15:12:48 -08:00
sbalineni
cc2b1c4961
Contrail plugin fixes -master branch, single commit, no transaction wrappers
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-15 14:11:49 -08:00
Min Chen
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
Sachchidanand Vaidya
0bff705621
Add L3VPN isolation method for contrail plugin
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:55:35 -08:00
Alex Huang
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
Devdeep Singh
f58d77c8d1
CLOUDSTACK-5689: System vm creation on local storage fails for hyper-v. A
...
null pointer exception was getting generated when a VolumeTO object was
serialized to create an answer object. If a local storage is used the uri
field will be null. Added null checks for the same.
2014-01-14 19:55:00 +05:30
Hugo Trippaers
b61f0a74ca
Centralize all eclipse m2e excludes in the main pom.xml
2014-01-14 09:39:42 +01:00
Min Chen
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
Likitha Shetty
a957d52a3c
CLOUDSTACK-5707. Hitting multiple 'User unauthenticated' exceptions when vCenter is upgraded to 5.5 from 5.1.
...
We hit these excptions whenever a management server held session that was with the old 5.1 vCenter server
is used to make resource calls to the new 5.5 vCenter.
Validate a vCenter session context before it is being used to make a resource call.
And if the context is invalid then discard the context and retrieve a new one.
During the invalidation of an old context handle the context disconnect better
by catching the appropriate exception and returning a newly created context.
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2014-01-14 09:38:50 +05:30
Murali Reddy
af657b3d71
CLOUDSTACK-5861: networks that failed to implement can not be destroyed
...
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Hugo Trippaers
3bea60435e
Remove commented elements
2014-01-13 12:16:37 +01:00
Hugo Trippaers
16d333f06d
Fix coverity issue 606007, 606008
2014-01-13 12:16:37 +01:00
Hugo Trippaers
044a2078a1
Fix coverity issue 573580
2014-01-13 12:16:37 +01:00