CLOUDSTACK-4659: Add the missing feature back for GC VMware worker VMs
CLOUDSTACK-4659: Fix the regression caused by worker VM consolidation for GC purpose
forgot to commit a modified file
CLOUDSTACK-4534:[object_store_refactor] Deleting uploaded volume is not
deleting the volume from backend.
CLOUDSTACK-4698: Check DHCP service in the network before get dhcp service provider
Apply https://reviews.apache.org/r/14084/
CLOUDSTACK-4688: UI > (1) Notifications widget - pollTimer() - error handling - check if args is null before trying to access args.message property (2) sharedFunctions.js - pollAsyncJobResult() - error handling - pass message argument to args.error().
CLOUDSTACK-4632: updateNetwork with the new network offering - log original and new network offerings' ids in the Action event
CLOUDSTACK-2266: marvin tests for IP Address reservation within a network it also adds the ipaddress parameter to virtual machine's create method in base.py

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-1800: Add automation tests for reset sshkey to access VM

Reviewed-By: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-2247: Automation - Reset a VM on Reboot

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
sdn hosted vpc gateways (using lswitch)
CLOUDSTACK-4637: Add 30sec sleep before router is ssh'd

Egress rules testcases access vm via router. Sleep before
accessing router else the expect fails since router is not
accessible. Also use router.hostid instead of vm.hostid
to identify the host.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 7d06e77ed9bfacf6d3b74f396c705567d4bf8ba2)
Added missing test for VPC load balancing rule from old QA repo to cloudstack repo

def test_04_VPC_CreateLBRuleInMultipleNetworksVRStoppedState

Since VPC now only allows load balancing on a single tier the test case
has been updated to check that condition

Ref : http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.0.2/html/Installation_Guide/configure-vpc.html

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Added a ManagementServer scope but it isn't used yet.  Added @Deprecated to one of the constructors
CLOUDSTACK-4700: UI > Instances > Reset VM action > if the template from which vm is created is password-enabled, pop up "Password hsa been reset to xxxxxxx" dialog.
CLOUDSTACK-4573: fixed resource limit check when acquire public IP in VPC - update resource count for VPC public ip even when network_id is not set yet.
Fixed non-oss build broken in Juniper SRX with commit 2614b00c513734ce6b1c29e572fbd7a37d4059fc
CLOUDSTACK-4702: UI > Network menu > Add Guest Network dialog > UI shouldn't pass null zoneid to listnetworkofferings API when zone dropdown is empty (i.e. when no advanced zone exists).
CLOUDSTACK-4668: Upgrade to 4.2 fails with NullPointerException when hypervisor_type is null for a cluster entry

Changes:
- Care for null value during comparing the hypervisor_type
- Do not consider removed clusters
- Method rename according to coding conventions